xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6291baaed261e36a63dc001307427fe00ba82259
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Mar 19 00:12:06 2015 +0900

    EXA: Return NULL from radeon_get_pixmap_bo if there is no driver private
    
    This mirrors what the glamor part of the function does. Fixes a crash
    running glxgears_pixmap with DRI3 enabled, reported by "marvin24" on IRC.

diff --git a/src/radeon.h b/src/radeon.h
index 6084cfe..375a726 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -678,7 +678,7 @@ static inline struct radeon_bo *radeon_get_pixmap_bo(PixmapPtr pPix)
     {
 	struct radeon_exa_pixmap_priv *driver_priv;
 	driver_priv = exaGetPixmapDriverPrivate(pPix);
-	return driver_priv->bo;
+	return driver_priv ? driver_priv->bo : NULL;
     }
 
     return NULL;