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/net/wan/hd64572.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/net/wan/hd64572.h')
0 files changed, 0 insertions, 0 deletions
