xf86-video-ati: Branch 'master'

[Michel Dänzer]

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

New commits:
commit d9a139bc6d453d33593685de67d1425611f3ab6f
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Mon Jul 16 12:51:26 2018 +0200

    glamor: Fix glamor_block_handler argument in radeon_glamor_finish
    
    I missed this before because this code isn't compiled with current
    xserver.
    
    Trivial.

diff --git a/src/radeon_glamor.h b/src/radeon_glamor.h
index 2740ab33..61d54e36 100644
--- a/src/radeon_glamor.h
+++ b/src/radeon_glamor.h
@@ -85,7 +85,7 @@ radeon_glamor_finish(ScrnInfoPtr scrn)
 #if HAVE_GLAMOR_FINISH
 	glamor_finish(scrn->pScreen);
 #else
-	glamor_block_handler(scrn);
+	glamor_block_handler(scrn->pScreen);
 	glFinish();
 #endif