xf86-video-ati: Branch 'master'

[Michel Dänzer]

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

New commits:
commit 40b87f0e9db2642ca8a70e994fb4d3742e199640
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Sep 12 18:44:10 2012 +0200

    glamor: Fix DRI2 crash introduced by PRIME changes.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index 02fe66d..7c5898c 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -358,7 +358,7 @@ radeon_dri2_create_buffer2(ScreenPtr pScreen,
         pixmap->refcnt++;
     }
 
-    if (!pixmap && attachment != DRI2BufferFrontLeft) {
+    if (!pixmap && (is_glamor_pixmap || attachment != DRI2BufferFrontLeft)) {
 	/* tile the back buffer */
 	switch(attachment) {
 	case DRI2BufferDepth: