xf86-video-ati: Branch 'master' - 2 commits

[Michel Dänzer]

 configure.ac     |    6 ++++++
 src/radeon.h     |   19 +++++++++++++++++++
 src/radeon_kms.c |    4 ++++
 3 files changed, 29 insertions(+)

New commits:
commit 156b5bc00da2eecb71cad517136f8cd74cf5d2c9
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Sep 20 17:50:20 2016 +0900

    Only define transform_region function for XF86_CRTC_VERSION >= 4
    
    We're not using it with older xserver.
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 9bcf657..0d61d49 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -402,6 +402,8 @@ radeon_scanout_extents_intersect(xf86CrtcPtr xf86_crtc, BoxPtr extents, int w,
     return (extents->x1 < extents->x2 && extents->y1 < extents->y2);
 }
 
+#if XF86_CRTC_VERSION >= 4
+
 static RegionPtr
 transform_region(RegionPtr region, struct pict_f_transform *transform,
 		 int w, int h)
@@ -440,6 +442,8 @@ transform_region(RegionPtr region, struct pict_f_transform *transform,
 	return transformed;
 }
 
+#endif
+
 static void
 radeon_sync_scanout_pixmaps(xf86CrtcPtr xf86_crtc, RegionPtr new_region,
 			    int scanout_id)
commit 80cc892ee1ce54fad3cb7dd11bd9df18c359136f
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Sep 20 17:45:16 2016 +0900

    Use local implementation of RegionDuplicate for older xserver
    
    It was only added in xserver 1.15. Fixes build against older xserver.
    
    Reported-by: Pali Rohár <pali.rohar at gmail.com>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/configure.ac b/configure.ac
index 394f45a..8dc55d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,6 +137,12 @@ else
 fi
 AM_CONDITIONAL(GLAMOR, test x$GLAMOR != xno)
 
+AC_CHECK_DECL(RegionDuplicate,
+	      [AC_DEFINE(HAVE_REGIONDUPLICATE, 1,
+	      [Have RegionDuplicate API])], [],
+	      [#include <xorg-server.h>
+	       #include <regionstr.h>])
+
 AC_CHECK_DECL(fbGlyphs,
 	      [AC_DEFINE(HAVE_FBGLYPHS, 1, [Have fbGlyphs API])], [],
 	      [#include <X11/Xmd.h>
diff --git a/src/radeon.h b/src/radeon.h
index f3a3e1c..590966f 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -96,6 +96,25 @@
 
 struct _SyncFence;
 
+#ifndef HAVE_REGIONDUPLICATE
+
+static inline RegionPtr
+RegionDuplicate(RegionPtr pOld)
+{
+    RegionPtr pNew;
+
+    pNew = RegionCreate(&pOld->extents, 0);
+    if (!pNew)
+	return NULL;
+    if (!RegionCopy(pNew, pOld)) {
+	RegionDestroy(pNew);
+	return NULL;
+    }
+    return pNew;
+}
+
+#endif
+
 #ifndef MAX
 #define MAX(a,b) ((a)>(b)?(a):(b))
 #endif