diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-12-07 15:35:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-12-07 15:35:21 +1000 |
| commit | 2ce8d192533a8c795714c5a9fb308ec74db40287 (patch) | |
| tree | d4cff58770a33932c49b223900241051558d9feb | |
| parent | 0dcd926d3092100854b3e362d6659d4950508aeb (diff) | |
don't add fboffset to info->FB it already is mapped at the offset
| -rw-r--r-- | src/radeon_cursor.c | 4 | ||||
| -rw-r--r-- | src/radeon_driver.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c index b8cfffd2..5004b64a 100644 --- a/src/radeon_cursor.c +++ b/src/radeon_cursor.c @@ -189,7 +189,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 @@ -231,7 +231,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")); diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 6db1d965..0632fd3c 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -3474,7 +3474,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, "Initializing fb layer\n"); /* Init fb layer */ - if (!fbScreenInit(pScreen, info->FB + pScrn->fbOffset, + if (!fbScreenInit(pScreen, info->FB, pScrn->virtualX, pScrn->virtualY, pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth, pScrn->bitsPerPixel)) |