xf86-video-ati: Branch 'master'

[Michel Dänzer]

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

New commits:
commit fccfd75ecf9ccfa628a8ff9c1fbb7f60c0f10ea5
Author: Joakim Tjernlund <joakim.tjernlund at infinera.com>
Date:   Fri Nov 24 17:27:09 2017 +0100

    Fix non GLAMOR build
    
    Non GLAMOR builds needs pRADEONEnt so move the USE_GLAMOR define
    down to make pRADEONEnt defined in this case.
    
    Signed-off-by: Joakim Tjernlund <joakim.tjernlund at infinera.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/radeon.h b/src/radeon.h
index d54e4990..3e04101c 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -712,9 +712,9 @@ uint32_t radeon_get_pixmap_tiling(PixmapPtr pPix);
 
 static inline Bool radeon_set_pixmap_bo(PixmapPtr pPix, struct radeon_bo *bo)
 {
-#ifdef USE_GLAMOR
     ScrnInfoPtr scrn = xf86ScreenToScrn(pPix->drawable.pScreen);
     RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
+#ifdef USE_GLAMOR
     RADEONInfoPtr info = RADEONPTR(scrn);
 
     if (info->use_glamor) {