xf86-video-ati: Branch 'master' - 2 commits

[Dave Airlie]

 src/radeon_cursor.c         |    3 ++-
 src/radeon_exa.c            |    2 +-
 src/radeon_textured_video.c |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit c3532268875fd24e6519bea2fb1b814d612bbdb4
Author: Dave Airlie <airlied at linux.ie>
Date:   Wed May 7 02:37:18 2008 +1000

    radeon: fix zaphod EXA with texture video

diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index 9e5fc5b..fa6ac0d 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -402,7 +402,7 @@ Bool RADEONSetupMemEXA (ScreenPtr pScreen)
     else
 	screen_size = pScrn->virtualY * byteStride;
 
-    info->exa->memoryBase = info->FB + pScrn->fbOffset;
+    info->exa->memoryBase = info->FB;
     info->exa->memorySize = info->FbMapSize - info->FbSecureSize;
     info->exa->offScreenBase = screen_size;
 
diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index 0a6598d..5d153e7 100644
--- a/src/radeon_textured_video.c
+++ b/src/radeon_textured_video.c
@@ -226,7 +226,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
     left = (x1 >> 16) & ~1;
     npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left;
 
-    pPriv->src_offset = pPriv->video_offset + info->fbLocation;
+    pPriv->src_offset = pPriv->video_offset + info->fbLocation + pScrn->fbOffset;
     pPriv->src_addr = (CARD8 *)(info->FB + pPriv->video_offset + (top * dstPitch));
     pPriv->src_pitch = dstPitch;
     pPriv->size = size;
commit ffc437f3606ab8ceba1ff152e4bb08988a58b54c
Author: Dave Airlie <airlied at linux.ie>
Date:   Wed May 7 02:30:28 2008 +1000

    avivo: fix zaphod cursor in theory

diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c
index 983aefb..42f9a85 100644
--- a/src/radeon_cursor.c
+++ b/src/radeon_cursor.c
@@ -92,6 +92,7 @@
 static void
 avivo_setup_cursor(xf86CrtcPtr crtc, Bool enable)
 {
+    ScrnInfoPtr pScrn = crtc->scrn;
     RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
     RADEONInfoPtr  info = RADEONPTR(crtc->scrn);
     unsigned char     *RADEONMMIO = info->MMIO;
@@ -100,7 +101,7 @@ avivo_setup_cursor(xf86CrtcPtr crtc, Bool enable)
 
     if (enable) {
 	OUTREG(AVIVO_D1CUR_SURFACE_ADDRESS + radeon_crtc->crtc_offset,
-	       info->fbLocation + radeon_crtc->cursor_offset);
+	       info->fbLocation + radeon_crtc->cursor_offset + pScrn->fbOffset);
 	OUTREG(AVIVO_D1CUR_SIZE + radeon_crtc->crtc_offset,
 	       ((CURSOR_WIDTH - 1) << 16) | (CURSOR_HEIGHT - 1));
 	OUTREG(AVIVO_D1CUR_CONTROL + radeon_crtc->crtc_offset,