drm/radeon/kms: properly handle 40 bit MC addresses in the cursor code
Subsystems (2)
PATCH 1/1 drm/radeon/kms: properly handle 40 bit MC addresses in the cursor code
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/radeon_cursor.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/radeon_cursor.c +9 -6
@@ -118,22 +118,25 @@ static void radeon_show_cursor(struct drm_crtc *crtc) }static void radeon_set_cursor (struct drm_crtc *crtc,struct drm_gem_object *obj, -uint32_t gpu_addr) +uint64_t gpu_addr) {struct radeon_crtc *radeon_crtc =to_radeon_crtc (crtc);struct radeon_device *rdev = crtc->dev->dev_private;if (ASIC_IS_DCE4 (rdev)) { -WREG32 (EVERGREEN_CUR_SURFACE_ADDRESS_HIGH + radeon_crtc->crtc_offset,0 ); -WREG32 (EVERGREEN_CUR_SURFACE_ADDRESS + radeon_crtc->crtc_offset, gpu_addr); +WREG32 (EVERGREEN_CUR_SURFACE_ADDRESS_HIGH + radeon_crtc->crtc_offset, +upper_32_bits (gpu_addr)); +WREG32 (EVERGREEN_CUR_SURFACE_ADDRESS + radeon_crtc->crtc_offset, + gpu_addr &0xffffffff ); }else if (ASIC_IS_AVIVO (rdev)) {if (rdev->family >=CHIP_RV770 ) {if (radeon_crtc->crtc_id) -WREG32 (R700_D2CUR_SURFACE_ADDRESS_HIGH ,0 ); +WREG32 (R700_D2CUR_SURFACE_ADDRESS_HIGH ,upper_32_bits (gpu_addr));else -WREG32 (R700_D1CUR_SURFACE_ADDRESS_HIGH ,0 ); +WREG32 (R700_D1CUR_SURFACE_ADDRESS_HIGH ,upper_32_bits (gpu_addr)); } -WREG32 (AVIVO_D1CUR_SURFACE_ADDRESS + radeon_crtc->crtc_offset, gpu_addr); +WREG32 (AVIVO_D1CUR_SURFACE_ADDRESS + radeon_crtc->crtc_offset, + gpu_addr &0xffffffff ); }else { radeon_crtc->legacy_cursor_offset = gpu_addr - radeon_crtc->legacy_display_base_addr;/* offset is from DISP(2)_BASE_ADDRESS */
Signature · 1 line
1.7.1.1