xf86-video-ati: Branch 'master'

[Dave Airlie]

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

New commits:
commit 186bf719c394116341abff471fb4b4803650da9a
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Oct 7 17:23:36 2009 +1000

    radeon: fix rotation since mixed pixmaps.
    
    Passing null in here stops the mixed pixmap code doing it wrong,
    but I'm not 100% sure how it is meant to work, we have the
    same issue with the real front bo by the looks of it.

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index f82dec8..a1ec2c2 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -449,7 +449,7 @@ drmmode_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
 					       pScrn->depth,
 					       pScrn->bitsPerPixel,
 					       rotate_pitch,
-					       data);
+					       NULL);
 
 	if (rotate_pixmap == NULL) {
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,