xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_kms.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 80fc78633962c1ec996b1721bfb757b98dc85bfc
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Jan 31 16:25:37 2017 +0900

    Don't handle Option "SwapbuffersWait" at all with glamor
    
    It never had any effect with glamor.
    
    v2: Better formatting, no functional change from v1.
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com> (v1)

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 4468525..a95b51a 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -1801,10 +1801,13 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 	}
     }
 
-    info->swapBuffersWait = xf86ReturnOptValBool(info->Options,
-						 OPTION_SWAPBUFFERS_WAIT, TRUE);
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-	       "SwapBuffers wait for vsync: %sabled\n", info->swapBuffersWait ? "en" : "dis");
+    if (!info->use_glamor) {
+	info->swapBuffersWait =
+	    xf86ReturnOptValBool(info->Options, OPTION_SWAPBUFFERS_WAIT, TRUE);
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		   "SwapBuffers wait for vsync: %sabled\n",
+		   info->swapBuffersWait ? "en" : "dis");
+    }
 
     if (xf86ReturnOptValBool(info->Options, OPTION_DELETE_DP12, FALSE)) {
         info->drmmode.delete_dp_12_displays = TRUE;