summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/radeon/evergreen_reg.h
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-04-10 17:58:42 +0400
committerAlex Deucher <alexander.deucher@amd.com>2013-04-22 18:39:08 +0400
commit968c01664ccbe0e46c19a1af662c4c266a904203 (patch)
tree886a1c76b96d967c525a3a31dded04e67bd651ba /drivers/gpu/drm/radeon/evergreen_reg.h
parent2f86e2ede39a98650c2d465857405ef1c51372b1 (diff)
downloadlinux-968c01664ccbe0e46c19a1af662c4c266a904203.tar.xz
drm/radeon: properly lock disp in mc_stop/resume for evergreen+
Need to wait for the new addresses to take affect before re-enabling the MC. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen_reg.h')
-rw-r--r--drivers/gpu/drm/radeon/evergreen_reg.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen_reg.h b/drivers/gpu/drm/radeon/evergreen_reg.h
index f585be16e2d5..881aba23c477 100644
--- a/drivers/gpu/drm/radeon/evergreen_reg.h
+++ b/drivers/gpu/drm/radeon/evergreen_reg.h
@@ -226,6 +226,8 @@
#define EVERGREEN_CRTC_STATUS_HV_COUNT 0x6ea0
#define EVERGREEN_MASTER_UPDATE_MODE 0x6ef8
#define EVERGREEN_CRTC_UPDATE_LOCK 0x6ed4
+#define EVERGREEN_MASTER_UPDATE_LOCK 0x6ef4
+#define EVERGREEN_MASTER_UPDATE_MODE 0x6ef8
#define EVERGREEN_DC_GPIO_HPD_MASK 0x64b0
#define EVERGREEN_DC_GPIO_HPD_A 0x64b4