diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-08-03 10:19:20 +0900 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-08-15 15:14:53 -0400 |
| commit | d21b53673b9de052004e761fd1299d2e788b44b8 (patch) | |
| tree | bc21ab577f30078859add32dfd47ffdb0d407282 /present | |
| parent | 9f04fa3babaaabe0ed5bf4aa2563755bc6c45723 (diff) | |
present: Call set_abort_flip / restore_screen_pixmap in clear_window_flip
We were asserting that these were called before from other places, but
that isn't always the case, e.g. during server shutdown.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96951
Reported-and-Tested-by: Tod Jackson <tod.jackson@gmail.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'present')
| -rw-r--r-- | present/present.c | 4 | ||||
| -rw-r--r-- | present/present_priv.h | 6 | ||||
| -rw-r--r-- | present/present_screen.c | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/present/present.c b/present/present.c index 8d37395fc..a7ca06e36 100644 --- a/present/present.c +++ b/present/present.c @@ -417,7 +417,7 @@ present_set_tree_pixmap(WindowPtr window, TraverseTree(window, present_set_tree_pixmap_visit, &visit); } -static void +void present_restore_screen_pixmap(ScreenPtr screen) { present_screen_priv_ptr screen_priv = present_screen_priv(screen); @@ -451,7 +451,7 @@ present_restore_screen_pixmap(ScreenPtr screen) present_set_tree_pixmap(screen->root, NULL, screen_pixmap); } -static void +void present_set_abort_flip(ScreenPtr screen) { present_screen_priv_ptr screen_priv = present_screen_priv(screen); diff --git a/present/present_priv.h b/present/present_priv.h index 0d16cfaba..dfb4bdea9 100644 --- a/present/present_priv.h +++ b/present/present_priv.h @@ -187,6 +187,12 @@ void present_flip_destroy(ScreenPtr screen); void +present_restore_screen_pixmap(ScreenPtr screen); + +void +present_set_abort_flip(ScreenPtr screen); + +void present_check_flip_window(WindowPtr window); RRCrtcPtr diff --git a/present/present_screen.c b/present/present_screen.c index 2f91ac7dc..9d03c8aa4 100644 --- a/present/present_screen.c +++ b/present/present_screen.c @@ -92,11 +92,13 @@ present_clear_window_flip(WindowPtr window) present_vblank_ptr flip_pending = screen_priv->flip_pending; if (flip_pending && flip_pending->window == window) { - assert (flip_pending->abort_flip); + present_set_abort_flip(screen); flip_pending->window = NULL; } - if (screen_priv->flip_window == window) + if (screen_priv->flip_window == window) { + present_restore_screen_pixmap(screen); screen_priv->flip_window = NULL; + } } /* |