xf86-video-ati: Branch 'master'

[Jerome Glisse]

 src/radeon_dri2.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 53af6aa99dfb67b5223c28d5129a79694165048d
Author: Jerome Glisse <jglisse at redhat.com>
Date:   Wed Nov 14 12:15:47 2012 -0500

    radeon: avoid segfault when pixmap exceed GPU capabilities
    
    We might get a request for a pixmap/drawable that is too big
    for GPU capabilities in the dri2 get buffer path. In face of
    such things just return NULL to dri2 get buffer request. The
    GL driver should then use something like transparent black to
    avoid something too ugly on the screen.
    
    Signed-off-by: Jerome Glisse <jglisse at redhat.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index ebd813c..919f1f6 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -444,6 +444,10 @@ radeon_dri2_create_buffer2(ScreenPtr pScreen,
 	    info->exa_force_create = TRUE;
 	    exaMoveInPixmap(pixmap);
 	    info->exa_force_create = FALSE;
+	    if (exaGetPixmapDriverPrivate(pixmap) == NULL) {
+		/* this happen if pixmap is non accelerable */
+		goto error;
+	    }
 	}
 
 	if (is_glamor_pixmap)