xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_exa.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fc41b9042a5220a8419cc7b69ca3850cae6b903c
Author: Dave Airlie <airlied at linux.ie>
Date:   Wed May 7 01:32:23 2008 +1000

    radeon: fix EXA pixmap offset on zaphod

diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index a6ededa..9e5fc5b 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -189,7 +189,7 @@ Bool RADEONGetPixmapOffsetPitch(PixmapPtr pPix, CARD32 *pitch_offset)
 	if (bpp == 24)
 		bpp = 8;
 
-	offset = exaGetPixmapOffset(pPix) + info->fbLocation;
+	offset = exaGetPixmapOffset(pPix) + info->fbLocation + pScrn->fbOffset;
 	pitch = exaGetPixmapPitch(pPix);
 
 	return RADEONGetOffsetPitch(pPix, bpp, pitch_offset, offset, pitch);