|
 |
be8e7d1 |
From 3d53c471d7f8c477c46a1251100dd998e2609472 Mon Sep 17 00:00:00 2001
|
|
|
be8e7d1 |
From: Ray Strode <rstrode@redhat.com>
|
|
|
be8e7d1 |
Date: Tue, 6 Oct 2009 15:30:33 -0400
|
|
|
be8e7d1 |
Subject: [PATCH 1/2] [drm] don't close terminal
|
|
|
be8e7d1 |
|
|
|
be8e7d1 |
It belongs to the core daemon, not the plugin.
|
|
|
be8e7d1 |
---
|
|
|
be8e7d1 |
src/plugins/renderers/drm/plugin.c | 1 -
|
|
|
be8e7d1 |
1 files changed, 0 insertions(+), 1 deletions(-)
|
|
|
be8e7d1 |
|
|
|
be8e7d1 |
diff --git a/src/plugins/renderers/drm/plugin.c b/src/plugins/renderers/drm/plugin.c
|
|
|
be8e7d1 |
index 34aa8f8..d317e2a 100644
|
|
|
be8e7d1 |
--- a/src/plugins/renderers/drm/plugin.c
|
|
|
be8e7d1 |
+++ b/src/plugins/renderers/drm/plugin.c
|
|
|
be8e7d1 |
@@ -487,7 +487,6 @@ open_device (ply_renderer_backend_t *backend)
|
|
|
be8e7d1 |
static void
|
|
|
be8e7d1 |
close_device (ply_renderer_backend_t *backend)
|
|
|
be8e7d1 |
{
|
|
|
be8e7d1 |
- ply_terminal_close (backend->terminal);
|
|
|
be8e7d1 |
free_heads (backend);
|
|
|
be8e7d1 |
|
|
|
be8e7d1 |
ply_console_stop_watching_for_active_vt_change (backend->console,
|
|
|
be8e7d1 |
--
|
|
|
be8e7d1 |
1.6.5.rc2
|
|
|
be8e7d1 |
|
|
|
be8e7d1 |
|
|
|
be8e7d1 |
From 4c777de9fc17cb4b8ab454b26e2ece646c4829c9 Mon Sep 17 00:00:00 2001
|
|
|
be8e7d1 |
From: Ray Strode <rstrode@redhat.com>
|
|
|
be8e7d1 |
Date: Tue, 6 Oct 2009 15:31:53 -0400
|
|
|
be8e7d1 |
Subject: [PATCH 2/2] [renderer] close device on failures
|
|
|
be8e7d1 |
|
|
|
be8e7d1 |
Before we were just unloading the module without
|
|
|
be8e7d1 |
closing it.
|
|
|
be8e7d1 |
---
|
|
|
be8e7d1 |
src/libplybootsplash/ply-renderer.c | 2 ++
|
|
|
be8e7d1 |
1 files changed, 2 insertions(+), 0 deletions(-)
|
|
|
be8e7d1 |
|
|
|
be8e7d1 |
diff --git a/src/libplybootsplash/ply-renderer.c b/src/libplybootsplash/ply-renderer.c
|
|
|
be8e7d1 |
index 08a246b..f7f3c90 100644
|
|
|
be8e7d1 |
--- a/src/libplybootsplash/ply-renderer.c
|
|
|
be8e7d1 |
+++ b/src/libplybootsplash/ply-renderer.c
|
|
|
be8e7d1 |
@@ -247,6 +247,7 @@ ply_renderer_open (ply_renderer_t *renderer)
|
|
|
be8e7d1 |
{
|
|
|
be8e7d1 |
ply_trace ("could not query rendering device for plugin %s",
|
|
|
be8e7d1 |
plugin_path);
|
|
|
be8e7d1 |
+ ply_renderer_close_device (renderer);
|
|
|
be8e7d1 |
ply_renderer_unload_plugin (renderer);
|
|
|
be8e7d1 |
continue;
|
|
|
be8e7d1 |
}
|
|
|
be8e7d1 |
@@ -255,6 +256,7 @@ ply_renderer_open (ply_renderer_t *renderer)
|
|
|
be8e7d1 |
{
|
|
|
be8e7d1 |
ply_trace ("could not map renderer to device for plugin %s",
|
|
|
be8e7d1 |
plugin_path);
|
|
|
be8e7d1 |
+ ply_renderer_close_device (renderer);
|
|
|
be8e7d1 |
ply_renderer_unload_plugin (renderer);
|
|
|
be8e7d1 |
continue;
|
|
|
be8e7d1 |
}
|
|
|
be8e7d1 |
--
|
|
|
be8e7d1 |
1.6.5.rc2
|
|
|
be8e7d1 |
|