xf86-video-ati: Branch 'master'

[Michel Dänzer]

 man/radeon.man   |    2 ++
 src/radeon_kms.c |    4 ++++
 2 files changed, 6 insertions(+)

New commits:
commit 1181b9c582f10b6c523e4b2988e2ce87ecf3d367
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue May 10 19:02:20 2016 +0900

    Enable DRI3 by default when building for Xorg >= 1.18.3
    
    Seems to work well enough in general now.
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/man/radeon.man b/man/radeon.man
index 1acdc63..cacafb5 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -270,6 +270,8 @@ Sea Islands.
 .BI "Option \*qDRI\*q \*q" integer \*q
 Define the maximum level of DRI to enable. Valid values are 2 for DRI2 or 3 for DRI3.
 The default is
+.B 3 for DRI3
+if the driver was compiled for Xorg >= 1.18.3, otherwise
 .B 2 for DRI2.
 .TP
 .BI "Option \*qEnablePageFlip\*q \*q" boolean \*q
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index c35c951..940aad2 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -1722,7 +1722,11 @@ Bool RADEONScreenInit_KMS(SCREEN_INIT_ARGS_DECL)
     }
 #endif
 
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,18,3,0,0)
+    value = TRUE;
+#else
     value = FALSE;
+#endif
     from = X_DEFAULT;
 
     if (!info->r600_shadow_fb) {