xf86-video-ati: Branch 'master'

[Michel Dänzer]

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

New commits:
commit 1af044d7eee211fd4b248c236280274a68334da5
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Apr 22 18:43:02 2015 +0900

    DRI2: Clear old->devPrivate.ptr in fixup_glamor
    
    It doesn't point to the memory of the newly allocated BO. Fixes crash
    running piglit with Option "ShadowPrimary" enabled.
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index 31a1ce7..6bb3dc6 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -119,6 +119,7 @@ static PixmapPtr fixup_glamor(DrawablePtr drawable, PixmapPtr pixmap)
 				   0, 0,
 				   pixmap->devKind,
 				   NULL);
+	old->devPrivate.ptr = NULL;
 
 	screen->DestroyPixmap(pixmap);