frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Michel Dänzer 2016-08-03 10:19:20 +09:00 committed by Adam Jackson
parent 9f04fa3bab
commit d21b53673b
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
present/present.c
View File

@ -417,7 +417,7 @@ present_set_tree_pixmap(WindowPtr window,
TraverseTree(window, present_set_tree_pixmap_visit, &visit); TraverseTree(window, present_set_tree_pixmap_visit, &visit);
} }
static void void
present_restore_screen_pixmap(ScreenPtr screen) present_restore_screen_pixmap(ScreenPtr screen)
{ {
present_screen_priv_ptr screen_priv = present_screen_priv(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); present_set_tree_pixmap(screen->root, NULL, screen_pixmap);
} }
static void void
present_set_abort_flip(ScreenPtr screen) present_set_abort_flip(ScreenPtr screen)
{ {
present_screen_priv_ptr screen_priv = present_screen_priv(screen); present_screen_priv_ptr screen_priv = present_screen_priv(screen);

6
present/present_priv.h
View File

@ -186,6 +186,12 @@ present_vblank_destroy(present_vblank_ptr vblank);
void void
present_flip_destroy(ScreenPtr screen); present_flip_destroy(ScreenPtr screen);
void
present_restore_screen_pixmap(ScreenPtr screen);
void
present_set_abort_flip(ScreenPtr screen);
void void
present_check_flip_window(WindowPtr window); present_check_flip_window(WindowPtr window);

6
present/present_screen.c
View File

@ -92,11 +92,13 @@ present_clear_window_flip(WindowPtr window)
present_vblank_ptr flip_pending = screen_priv->flip_pending; present_vblank_ptr flip_pending = screen_priv->flip_pending;
if (flip_pending && flip_pending->window == window) { if (flip_pending && flip_pending->window == window) {
assert (flip_pending->abort_flip); present_set_abort_flip(screen);
flip_pending->window = NULL; 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; screen_priv->flip_window = NULL;
}
} }
/* /*