xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_dri2.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e3519be285bdab50ef2193f98826a351a4414fae
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Oct 16 16:09:23 2012 +1000

    radeon/dri2: fix the window->pixmap math properly.
    
    Okay kwin did things different, and I really hope this time this is the
    correct transformation operation. It works here with gears under kwin
    and under mutter and under xcompmgr.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index f8439d2..ebd813c 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -596,9 +596,10 @@ radeon_dri2_copy_region2(ScreenPtr pScreen,
     }
 
     if (translate && drawable->type == DRAWABLE_WINDOW) {
-	WindowPtr pWin = (WindowPtr)drawable;
-	off_x = pWin->origin.x;
-	off_y = pWin->origin.y;
+	PixmapPtr pPix = GetDrawablePixmap(drawable);
+
+	off_x = drawable->x - pPix->screen_x;
+	off_y = drawable->y - pPix->screen_y;
     }
     gc = GetScratchGC(dst_drawable->depth, pScreen);
     copy_clip = REGION_CREATE(pScreen, NULL, 0);