Merge branch 'drm-radeon-testing' of ../drm-radeon-next into drm-core-next
authorDave Airlie <airlied@redhat.com>
Tue, 3 Jan 2012 09:43:28 +0000 (09:43 +0000)
committerDave Airlie <airlied@redhat.com>
Tue, 3 Jan 2012 09:45:12 +0000 (09:45 +0000)
commit7a7e8734ac3235efafd34819b27fbdf5417e6d60
tree8e34492eaef018bd87065bb7552de15b6a1f0fa5
parent2318fcd65c1fb1e842f860c1e3fe4dba7e55cd11
parent93a4ed878a22b8489723bc3ab89dd401128bbc9e
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
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/evergreen_reg.h