xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 32b42627217917337553121191e9bc3b423b8d99
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Jan 16 11:44:37 2018 -0800

    modesetting: Use seq instead of msc in ms_queue_vblank failure path
    
    When the call to queue a vblank event fails, we need to clean up by
    removing the user-space queue entry. That is indexed by the local
    sequence number, not by the kernel vblank count. The call in this
    case was just passing the wrong value.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/hw/xfree86/drivers/modesetting/vblank.c b/hw/xfree86/drivers/modesetting/vblank.c
index fe046e48b..3f6568997 100644
--- a/hw/xfree86/drivers/modesetting/vblank.c
+++ b/hw/xfree86/drivers/modesetting/vblank.c
@@ -229,7 +229,7 @@ ms_queue_vblank(xf86CrtcPtr crtc, ms_queue_flag flags,
             return TRUE;
         }
         if (errno != EBUSY) {
-            ms_drm_abort_seq(scrn, msc);
+            ms_drm_abort_seq(scrn, seq);
             return FALSE;
         }
         ms_flush_drm_events(screen);