xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/drmmode_display.c |    5 +++++
 src/radeon_glamor.c   |    2 ++
 2 files changed, 7 insertions(+)

New commits:
commit 1a8c05fd5559be842d8a038df73de34d4b261c15
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Jan 11 13:22:24 2013 +0100

    Make CRTC shadow pixmaps usable by glamor.
    
    Fixes rotation with glamor.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index e4757ad..0d73856 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -140,6 +140,11 @@ static PixmapPtr drmmode_create_bo_pixmap(ScrnInfoPtr pScrn,
 		}
 	}
 
+	if (!radeon_glamor_create_textured_pixmap(pixmap)) {
+		pScreen->DestroyPixmap(pixmap);
+	  	return NULL;
+	}
+
 	return pixmap;
 }
 
diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
index c232cc2..5a7561f 100644
--- a/src/radeon_glamor.c
+++ b/src/radeon_glamor.c
@@ -131,6 +131,8 @@ radeon_glamor_create_textured_pixmap(PixmapPtr pixmap)
 		return TRUE;
 
 	priv = radeon_get_pixmap_private(pixmap);
+	if (!priv->stride)
+		priv->stride = pixmap->devKind;
 	if (glamor_egl_create_textured_pixmap(pixmap, priv->bo->handle,
 					      priv->stride))
 		return TRUE;