Attachment 125477 Details for Bug 96951 – present: Make present_restore_screen_pixmap handle screen->root == NULL

[patch] present: Make present_restore_screen_pixmap handle screen->root == NULL

0001-present-Make-present_restore_screen_pixmap-handle-sc.patch (text/plain), 1.47 KB, created by Michel Dänzer on 2016-08-02 09:25:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2016-08-02 09:25:08 UTC

Size: 1.47 KB

patch

obsolete

>From cec8afe4a1f3f631de5bf61d76c27c73436ae59c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
>Date: Tue, 2 Aug 2016 18:22:43 +0900
>Subject: [PATCH xserver] present: Make present_restore_screen_pixmap
> handle screen->root == NULL
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Easier than dealing with it in all paths that can end up here during
>server shutdown.
>---
> present/present.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/present/present.c b/present/present.c
>index 5fde846..8d37395 100644
>--- a/present/present.c
>+++ b/present/present.c
>@@ -439,7 +439,7 @@ present_restore_screen_pixmap(ScreenPtr screen)
>      * Only do this the first time for a particular unflip operation, or
>      * we'll probably scribble over other windows
>      */
>-    if (screen->GetWindowPixmap(screen->root) == flip_pixmap)
>+    if (screen->root && screen->GetWindowPixmap(screen->root) == flip_pixmap)
>         present_copy_region(&screen_pixmap->drawable, flip_pixmap, NULL, 0, 0);
> 
>     /* Switch back to using the screen pixmap now to avoid
>@@ -447,7 +447,8 @@ present_restore_screen_pixmap(ScreenPtr screen)
>      */
>     if (flip_window)
>         present_set_tree_pixmap(flip_window, flip_pixmap, screen_pixmap);
>-    present_set_tree_pixmap(screen->root, NULL, screen_pixmap);
>+    if (screen->root)
>+        present_set_tree_pixmap(screen->root, NULL, screen_pixmap);
> }
> 
> static void
>-- 
>2.8.1
>

Actions: View | Splinter Review

Attachments on bug 96951: 125094 | 125095 | 125096 | 125357 | 125359 | 125390 | 125402 | 125416 | 125423 | 125477

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.