diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2013-04-10 09:47:05 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2013-04-22 10:39:07 -0400 |
| commit | 2f86e2ede39a98650c2d465857405ef1c51372b1 (patch) | |
| tree | 868a64891f2b902d4d902220c5066856be16388b /drivers/gpu/drm/radeon/r500_reg.h | |
| parent | 10257a6d8359c41407eb26b7ad7bf710a7e00155 (diff) | |
| download | linux-2f86e2ede39a98650c2d465857405ef1c51372b1.tar.bz2 | |
drm/radeon: properly lock disp in mc_stop/resume for r5xx-r7xx
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/r500_reg.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/r500_reg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r500_reg.h b/drivers/gpu/drm/radeon/r500_reg.h index c0dc8d3ba0bb..b52420902124 100644 --- a/drivers/gpu/drm/radeon/r500_reg.h +++ b/drivers/gpu/drm/radeon/r500_reg.h @@ -358,6 +358,7 @@ #define AVIVO_D1CRTC_STATUS_HV_COUNT 0x60ac #define AVIVO_D1CRTC_STEREO_CONTROL 0x60c4 +#define AVIVO_D1MODE_MASTER_UPDATE_LOCK 0x60e0 #define AVIVO_D1MODE_MASTER_UPDATE_MODE 0x60e4 /* master controls */ |