xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/drivers/modesetting/dri2.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 78b6f940217c127f0f345b7710aa5994c6ded99c
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Apr 16 14:08:27 2018 -0400

    modesetting: Fix inverted check in dri2 WaitMSC
    
    ms_queue_vblank() returns false on failure.
    
    Reported-by: Chris Wilson <chris at chris-wilson.co.uk>
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Frank Binns <frank.binns at imgtec.com>
    Tested-by: Mike Lothian <mike at fireburn.co.uk>

diff --git a/hw/xfree86/drivers/modesetting/dri2.c b/hw/xfree86/drivers/modesetting/dri2.c
index fd36aa118..96eaaaaf7 100644
--- a/hw/xfree86/drivers/modesetting/dri2.c
+++ b/hw/xfree86/drivers/modesetting/dri2.c
@@ -749,7 +749,7 @@ ms_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw, CARD64 target_msc,
             target_msc = current_msc;
 
         ret = ms_queue_vblank(crtc, MS_QUEUE_ABSOLUTE, target_msc, &queued_msc, seq);
-        if (ret) {
+        if (!ret) {
             static int limit = 5;
             if (limit) {
                 xf86DrvMsg(scrn->scrnIndex, X_WARNING,