diff options
| author | Olivier Fourdan <ofourdan@redhat.com> | 2019-11-18 17:28:45 +0100 |
|---|---|---|
| committer | Olivier Fourdan <ofourdan@redhat.com> | 2019-11-21 10:52:12 +0100 |
| commit | 0e60139064b84b856c59e5a456e26c60710b1b69 (patch) | |
| tree | 17f484bd6d1f3acbfbc9a6fe8cc191131324d869 | |
| parent | 2edadf26f1f8deddbe171115fa502337ac62df02 (diff) | |
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@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/937
(cherry picked from commit 4f984fc06bd57cabfa38f6191f10714878dc8969)
| -rw-r--r-- | present/present_wnmd.c | 2 |
1 files changed, 0 insertions, 2 deletions
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) { |