xserver: Branch 'server-1.20-branch'

[GitLab Mirror]

 present/present_wnmd.c |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 0e60139064b84b856c59e5a456e26c60710b1b69
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Mon Nov 18 17:28:45 2019 +0100

    present/wnmd: Relax assertion on CRTC on abort_vblank()
    
    Currently, the function `present_wnmd_abort_vblank()` would fail if the
    given `crtc` is NULL.
    
    However, `xwl_present_get_crtc()` can return `NULL` under some
    circumstances, which would cause an unexpected termination of Xwayland
    in such a case, caused by the assertion failure being triggered.
    
    Remove the assertion, considering that the `crtc` isn't actually used in
    neither `present_wnmd_abort_vblank()` nor `xwl_present_abort_vblank()`.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>
    Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/937
    (cherry picked from commit 4f984fc06bd57cabfa38f6191f10714878dc8969)

diff --git a/present/present_wnmd.c b/present/present_wnmd.c
index 9d0b147cc..82bae4022 100644
--- a/present/present_wnmd.c
+++ b/present/present_wnmd.c
@@ -649,8 +649,6 @@ present_wnmd_abort_vblank(ScreenPtr screen, WindowPtr window, RRCrtcPtr crtc, ui
     present_window_priv_ptr window_priv = present_window_priv(window);
     present_vblank_ptr      vblank;
 
-    assert(crtc);
-
     (*screen_priv->wnmd_info->abort_vblank) (window, crtc, event_id, msc);
 
     xorg_list_for_each_entry(vblank, &window_priv->exec_queue, event_queue) {