summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-06-04 12:28:41 +1000
committerDave Airlie <airlied@redhat.com>2015-06-04 12:28:41 +1000
commit0546b72b1da74937adec56bece7e3dded534e89a (patch)
tree9e65fae5b2004e5ec4270bf04cf2a892d65a91e2
parentc65b99f046843d2455aa231747b5a07a999a9f3d (diff)
parent091f0a70ffe2a1297d52fe32d6c6794d955e01e5 (diff)
downloadlinux-0546b72b1da74937adec56bece7e3dded534e89a.tar.bz2
Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
One more small r7xx audio regression fix for 4.1 * 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux: drm/radeon: use proper ACR regisiter for DCE3.2
-rw-r--r--drivers/gpu/drm/radeon/dce3_1_afmt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/dce3_1_afmt.c b/drivers/gpu/drm/radeon/dce3_1_afmt.c
index f04205170b8a..cfa3a84a2af0 100644
--- a/drivers/gpu/drm/radeon/dce3_1_afmt.c
+++ b/drivers/gpu/drm/radeon/dce3_1_afmt.c
@@ -173,7 +173,7 @@ void dce3_2_hdmi_update_acr(struct drm_encoder *encoder, long offset,
struct drm_device *dev = encoder->dev;
struct radeon_device *rdev = dev->dev_private;
- WREG32(HDMI0_ACR_PACKET_CONTROL + offset,
+ WREG32(DCE3_HDMI0_ACR_PACKET_CONTROL + offset,
HDMI0_ACR_SOURCE | /* select SW CTS value */
HDMI0_ACR_AUTO_SEND); /* allow hw to sent ACR packets when required */