xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit ce581ac3fa80c4c52d87bd54fa92bc566b7d6adc
Author: Axel Davy <axel.davy at ens.fr>
Date:   Wed Jun 18 22:22:09 2014 -0400

    present: fix bad logic in cancelling scheduled operations.
    
    If we present several pixmaps in advance for different msc, the later one
    shouldn't cancel the previous ones.
    
    This reverts a change made by commit
    e6f5d9d7b7efdacea0f22f1808efca849bcede4c
    
    Without this fix, vblank_mode=0 glxgears doesn't update
    with the present fallback.
    
    Signed-off-by: Axel Davy <axel.davy at ens.fr>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/present/present.c b/present/present.c
index 271c251..3aea0d7 100644
--- a/present/present.c
+++ b/present/present.c
@@ -771,7 +771,7 @@ present_pixmap(WindowPtr window,
             if (!vblank->queued)
                 continue;
 
-            if (vblank->crtc != target_crtc || vblank->target_msc > target_msc)
+            if (vblank->crtc != target_crtc || vblank->target_msc != target_msc)
                 continue;
 
             DebugPresent(("\tx %lld %p %8lld: %08lx -> %08lx (crtc %p)\n",