diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-09-01 17:20:42 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-09-01 21:29:14 -0400 |
| commit | 95347871865ca5093c7e87a223274f7c3b5eccda (patch) | |
| tree | 2c28181a7e6ce5daf510eec965f7dcf2676afff0 /drivers/gpu | |
| parent | cf4c12f9a2289e3679722590e1226ae8deb14385 (diff) | |
drm/radeon/kms: properly set crtc high base on r7xx
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_crtc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 977f5c20ef1..71b31509afc 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c | |||
| @@ -1070,11 +1070,11 @@ static int avivo_crtc_set_base(struct drm_crtc *crtc, int x, int y, | |||
| 1070 | 1070 | ||
| 1071 | if (rdev->family >= CHIP_RV770) { | 1071 | if (rdev->family >= CHIP_RV770) { |
| 1072 | if (radeon_crtc->crtc_id) { | 1072 | if (radeon_crtc->crtc_id) { |
| 1073 | WREG32(R700_D2GRPH_PRIMARY_SURFACE_ADDRESS_HIGH, 0); | 1073 | WREG32(R700_D2GRPH_PRIMARY_SURFACE_ADDRESS_HIGH, upper_32_bits(fb_location)); |
| 1074 | WREG32(R700_D2GRPH_SECONDARY_SURFACE_ADDRESS_HIGH, 0); | 1074 | WREG32(R700_D2GRPH_SECONDARY_SURFACE_ADDRESS_HIGH, upper_32_bits(fb_location)); |
| 1075 | } else { | 1075 | } else { |
| 1076 | WREG32(R700_D1GRPH_PRIMARY_SURFACE_ADDRESS_HIGH, 0); | 1076 | WREG32(R700_D1GRPH_PRIMARY_SURFACE_ADDRESS_HIGH, upper_32_bits(fb_location)); |
| 1077 | WREG32(R700_D1GRPH_SECONDARY_SURFACE_ADDRESS_HIGH, 0); | 1077 | WREG32(R700_D1GRPH_SECONDARY_SURFACE_ADDRESS_HIGH, upper_32_bits(fb_location)); |
| 1078 | } | 1078 | } |
| 1079 | } | 1079 | } |
| 1080 | WREG32(AVIVO_D1GRPH_PRIMARY_SURFACE_ADDRESS + radeon_crtc->crtc_offset, | 1080 | WREG32(AVIVO_D1GRPH_PRIMARY_SURFACE_ADDRESS + radeon_crtc->crtc_offset, |