diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-01-03 09:43:28 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-01-03 09:45:12 +0000 |
| commit | 7a7e8734ac3235efafd34819b27fbdf5417e6d60 (patch) | |
| tree | 8e34492eaef018bd87065bb7552de15b6a1f0fa5 /drivers/gpu/drm/radeon/evergreen_reg.h | |
| parent | 2318fcd65c1fb1e842f860c1e3fe4dba7e55cd11 (diff) | |
| parent | 93a4ed878a22b8489723bc3ab89dd401128bbc9e (diff) | |
| download | blackbird-op-linux-7a7e8734ac3235efafd34819b27fbdf5417e6d60.tar.gz blackbird-op-linux-7a7e8734ac3235efafd34819b27fbdf5417e6d60.zip | |
Merge branch 'drm-radeon-testing' of ../drm-radeon-next into drm-core-next
This merges the evergreen HDMI audio support.
* 'drm-radeon-testing' of ../drm-radeon-next:
drm/radeon/kms: define TMDS/LVTM HDMI enabling bits
drm/radeon/kms: workaround invalid AVI infoframe checksum issue
drm/radeon/kms: setup HDMI mode on Evergreen encoders
drm/radeon/kms: support for audio on Evergreen
drm/radeon/kms: minor HDMI audio cleanups
drm/radeon/kms: do not force DVI mode on DCE4 if audio is on
ridge
Conflicts:
drivers/gpu/drm/radeon/evergreen.c
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen_reg.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen_reg.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen_reg.h b/drivers/gpu/drm/radeon/evergreen_reg.h index 7d7f2155e34c..4215de95477e 100644 --- a/drivers/gpu/drm/radeon/evergreen_reg.h +++ b/drivers/gpu/drm/radeon/evergreen_reg.h @@ -35,6 +35,14 @@ #define EVERGREEN_P1PLL_SS_CNTL 0x414 #define EVERGREEN_P2PLL_SS_CNTL 0x454 # define EVERGREEN_PxPLL_SS_EN (1 << 12) + +#define EVERGREEN_AUDIO_PLL1_MUL 0x5b0 +#define EVERGREEN_AUDIO_PLL1_DIV 0x5b4 +#define EVERGREEN_AUDIO_PLL1_UNK 0x5bc + +#define EVERGREEN_AUDIO_ENABLE 0x5e78 +#define EVERGREEN_AUDIO_VENDOR_ID 0x5ec0 + /* GRPH blocks at 0x6800, 0x7400, 0x10000, 0x10c00, 0x11800, 0x12400 */ #define EVERGREEN_GRPH_ENABLE 0x6800 #define EVERGREEN_GRPH_CONTROL 0x6804 @@ -220,4 +228,9 @@ #define EVERGREEN_DC_GPIO_HPD_EN 0x64b8 #define EVERGREEN_DC_GPIO_HPD_Y 0x64bc +/* HDMI blocks at 0x7030, 0x7c30, 0x10830, 0x11430, 0x12030, 0x12c30 */ +#define EVERGREEN_HDMI_BASE 0x7030 + +#define EVERGREEN_HDMI_CONFIG_OFFSET 0xf0 + #endif |
