diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-12-10 15:18:03 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-12-10 15:18:03 +1000 |
| commit | 9c278cb7fa7f18d13bde053fd75221cfba9da377 (patch) | |
| tree | e4eb9332de9c496c001ce74054c0b5353ca2f643 /src/radeon_cursor.c | |
| parent | 6451ea2dcc4fac762442f699935864f4a8d445f7 (diff) | |
| parent | cc167b9bb7f1c3b8579e51e7bc2fca2f8eba6bd1 (diff) | |
Merge branch 'zaphod-lolz' of git://git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
Conflicts:
src/radeon.h
src/radeon_crtc.c
src/radeon_driver.c
src/radeon_output.c
Diffstat (limited to 'src/radeon_cursor.c')
| -rw-r--r-- | src/radeon_cursor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c index 282ffd83..00913c85 100644 --- a/src/radeon_cursor.c +++ b/src/radeon_cursor.c @@ -230,7 +230,7 @@ radeon_crtc_set_cursor_colors (xf86CrtcPtr crtc, int bg, int fg) { ScrnInfoPtr pScrn = crtc->scrn; RADEONInfoPtr info = RADEONPTR(pScrn); - CARD32 *pixels = (CARD32 *)(pointer)(info->FB + info->cursor_offset + pScrn->fbOffset); + CARD32 *pixels = (CARD32 *)(pointer)(info->FB + info->cursor_offset); int pixel, i; CURSOR_SWAPPING_DECL_MMIO @@ -272,7 +272,7 @@ radeon_crtc_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image) ScrnInfoPtr pScrn = crtc->scrn; RADEONInfoPtr info = RADEONPTR(pScrn); unsigned char *RADEONMMIO = info->MMIO; - CARD32 *d = (CARD32 *)(pointer)(info->FB + info->cursor_offset + pScrn->fbOffset); + CARD32 *d = (CARD32 *)(pointer)(info->FB + info->cursor_offset); RADEONCTRACE(("RADEONLoadCursorARGB\n")); |