xserver: Branch 'master'

[Adam Jackson]

 Xext/sync.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 528cf6fcee1839cb829652a49c1b1bf45d6a37fb
Author: David Weinehall <david.weinehall at linux.intel.com>
Date:   Thu Jan 18 15:12:46 2018 +0200

    sync: Fix diffgreater comparison
    
    xsync: Fix diffgreater comparison
    
    While transitioning from CARD64 to int64,
    the GreaterThan call was mistakenly transformed into ">=".
    Part of this was fixed already in
    commit 8060196a3e80a3c0ad2c0abbe459416821cd366c
    
    This patch fixes the remaining issue.
    
    Signed-off-by: David Weinehall <david.weinehall at linux.intel.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>

diff --git a/Xext/sync.c b/Xext/sync.c
index 37d41f224..8f22a865b 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -660,7 +660,7 @@ SyncAwaitTriggerFired(SyncTrigger * pTrigger)
              */
             if (overflow)
                 continue;
-            diffgreater = diff >= pAwait->event_threshold;
+            diffgreater = diff > pAwait->event_threshold;
             diffequal = diff == pAwait->event_threshold;
 
             /* "If the test-type is PositiveTransition or