Rev 1404 | Rev 1963 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1404 | Rev 1430 | ||
---|---|---|---|
Line 81... | Line 81... | ||
81 | 81 | ||
Line 82... | Line 82... | ||
82 | if (ASIC_IS_AVIVO(rdev)) |
82 | if (ASIC_IS_AVIVO(rdev)) |
83 | WREG32(AVIVO_D1CUR_SURFACE_ADDRESS + radeon_crtc->crtc_offset, gpu_addr); |
83 | WREG32(AVIVO_D1CUR_SURFACE_ADDRESS + radeon_crtc->crtc_offset, gpu_addr); |
84 | else { |
84 | else { |
85 | radeon_crtc->legacy_cursor_offset = gpu_addr - rdev->mc.vram_location; |
85 | radeon_crtc->legacy_cursor_offset = gpu_addr - rdev->mc.vram_start; |
86 | /* offset is from DISP(2)_BASE_ADDRESS */ |
86 | /* offset is from DISP(2)_BASE_ADDRESS */ |
87 | WREG32(RADEON_CUR_OFFSET + radeon_crtc->crtc_offset, radeon_crtc->legacy_cursor_offset); |
87 | WREG32(RADEON_CUR_OFFSET + radeon_crtc->crtc_offset, radeon_crtc->legacy_cursor_offset); |
88 | } |
88 | } |
Line 89... | Line 89... | ||
89 | 89 | ||
Line 173... | Line 173... | ||
173 | gpu_addr = radeon_bo_gpu_offset(cursor->robj); |
173 | gpu_addr = radeon_bo_gpu_offset(cursor->robj); |
Line 174... | Line 174... | ||
174 | 174 | ||
175 | /* offset is from DISP(2)_BASE_ADDRESS */ |
175 | /* offset is from DISP(2)_BASE_ADDRESS */ |
176 | WREG32(RADEON_CUR_OFFSET, |
176 | WREG32(RADEON_CUR_OFFSET, |
177 | (gpu_addr - rdev->mc.vram_location + (yorg * 256))); |
177 | (gpu_addr - rdev->mc.vram_start + (yorg * 256))); |
178 | } |
178 | } |
179 | radeon_lock_cursor_kms(crtc, false); |
179 | radeon_lock_cursor_kms(crtc, false); |
Line 180... | Line 180... | ||
180 | } |
180 | } |