Rev 1313 | Rev 1404 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1313 | Rev 1403 | ||
|---|---|---|---|
| Line 1... | Line -... | ||
| 1 | #include |
- | |
| 2 | #include |
1 | #include |
| 3 | #include |
2 | #include |
| 4 | #include |
3 | #include |
| 5 | #include "radeon_drm.h" |
4 | #include "radeon_drm.h" |
| 6 | #include "radeon.h" |
5 | #include "radeon.h" |
| Line 58... | Line 57... | ||
| 58 | *bits++ = 0; |
57 | *bits++ = 0; |
| 59 | 58 | ||
| Line 60... | Line 59... | ||
| 60 | radeon_object_kunmap(cursor->robj); |
59 | radeon_object_kunmap(cursor->robj); |
| Line 61... | Line 60... | ||
| 61 | 60 | ||
| Line 62... | Line 61... | ||
| 62 | cursor->header.destroy = destroy_cursor; |
61 | // cursor->header.destroy = destroy_cursor; |
| 63 | 62 | ||
| Line 64... | Line 63... | ||
| 64 | return 0; |
63 | return 0; |
| Line 99... | Line 98... | ||
| 99 | 98 | ||
| Line 100... | Line 99... | ||
| 100 | old = rdisplay->cursor; |
99 | old = rdisplay->cursor; |
| Line 101... | Line 100... | ||
| 101 | 100 | ||
| 102 | rdisplay->cursor = cursor; |
101 | rdisplay->cursor = cursor; |
| Line 103... | Line 102... | ||
| 103 | gpu_addr = cursor->robj->gpu_addr; |
102 | // gpu_addr = cursor->robj->gpu_addr; |
| 104 | 103 | ||
| 105 | if (ASIC_IS_AVIVO(rdev)) |
104 | if (ASIC_IS_AVIVO(rdev)) |
| 106 | WREG32(AVIVO_D1CUR_SURFACE_ADDRESS, gpu_addr); |
105 | WREG32(AVIVO_D1CUR_SURFACE_ADDRESS, gpu_addr); |
| Line 161... | Line 160... | ||
| 161 | (RADEON_CUR_LOCK | (hot_x << 16) | hot_y )); |
160 | (RADEON_CUR_LOCK | (hot_x << 16) | hot_y )); |
| 162 | WREG32(RADEON_CUR_HORZ_VERT_POSN, |
161 | WREG32(RADEON_CUR_HORZ_VERT_POSN, |
| 163 | (RADEON_CUR_LOCK | (x << 16) | y)); |
162 | (RADEON_CUR_LOCK | (x << 16) | y)); |
| 164 | 163 | ||
| Line 165... | Line 164... | ||
| 165 | gpu_addr = cursor->robj->gpu_addr; |
164 | // gpu_addr = cursor->robj->gpu_addr; |
| Line 166... | Line 165... | ||
| 166 | 165 | ||
| 167 | /* offset is from DISP(2)_BASE_ADDRESS */ |
166 | /* offset is from DISP(2)_BASE_ADDRESS */ |
| 168 | WREG32(RADEON_CUR_OFFSET, |
167 | WREG32(RADEON_CUR_OFFSET, |
| 169 | (gpu_addr - rdev->mc.vram_location + (hot_y * 256))); |
168 | (gpu_addr - rdev->mc.vram_location + (hot_y * 256))); |