[PATCH 1/5] [main] deactivate renderer before hiding

Scott James Remnant scott at ubuntu.com
Thu Mar 18 14:28:52 PDT 2010


If we don't deactivate the renderer before hiding the splash, the
drm renderer may scan out the buffer contents to the fbcon buffer;
since we only hide the splash when dumping details or when
--retain-splash is *not* given to quit, this is exactly the
opposite of what we want.

The effect of not doing this is partial splash contents behind the
details in cases of error, or when using quit.  This doesn't affect
plymouth quit --retain-splash.
---
 src/main.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main.c b/src/main.c
index 0577d57..57a73d0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -659,6 +659,8 @@ dump_details_and_quit_splash (state_t *state)
   state->showing_details = false;
   on_escape_pressed (state);
 
+  if (state->renderer != NULL)
+    ply_renderer_deactivate (state->renderer);
   if (state->boot_splash != NULL)
     ply_boot_splash_hide (state->boot_splash);
 
@@ -773,6 +775,8 @@ on_boot_splash_idle (state_t *state)
       if (!state->should_retain_splash)
         {
           ply_trace ("hiding splash");
+          if (state->renderer != NULL)
+            ply_renderer_deactivate (state->renderer);
           if (state->boot_splash != NULL)
             ply_boot_splash_hide (state->boot_splash);
         }
-- 
1.7.0



More information about the plymouth mailing list