rpms/plymouth/F-12 fix-firstboot-on-radeon.patch, NONE, 1.1 plymouth.spec, 1.151, 1.152

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16492

Modified Files:
	plymouth.spec 
Added Files:
	fix-firstboot-on-radeon.patch 
Log Message:
- Prevent firstboot's X from crashing on radeon hardware. This should
  only affect multihead users, but for some reason it's getting some
  single head users as well.


fix-firstboot-on-radeon.patch:
 plugin.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE fix-firstboot-on-radeon.patch ---
>From 0bb06a8afadb51ba109019b6df2415d6e8d30aa8 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 7 Oct 2009 17:26:16 -0400
Subject: [PATCH] [drm] Destroy console buffer object on error path

We were leaking the object if it couldn't be mapped.
---
 src/plugins/renderers/drm/plugin.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/plugins/renderers/drm/plugin.c b/src/plugins/renderers/drm/plugin.c
index 22a4394..3081ac8 100644
--- a/src/plugins/renderers/drm/plugin.c
+++ b/src/plugins/renderers/drm/plugin.c
@@ -812,7 +812,11 @@ ply_renderer_head_set_scan_out_buffer_to_console (ply_renderer_backend_t *backen
 
   if (!backend->driver_interface->map_buffer (backend->driver,
                                               head->console_buffer_id))
-    return false;
+    {
+      backend->driver_interface->destroy_buffer (backend->driver,
+                                                 head->console_buffer_id);
+      return false;
+    }
 
   if (head->area.width != width || head->area.height != height)
     {
-- 
1.6.5.rc2



Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-12/plymouth.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- plymouth.spec	6 Oct 2009 23:21:59 -0000	1.151
+++ plymouth.spec	7 Oct 2009 21:30:46 -0000	1.152
@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.4%{?dist}
+Release: 0.2009.29.09.5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -32,6 +32,7 @@ Obsoletes: plymouth-theme-pulser < 0.7.0
 Patch0: fix-2nd-show-splash.patch
 Patch1: fix-text-password-crash.patch
 Patch2: fix-firstboot-on-intel.patch
+Patch3: fix-firstboot-on-radeon.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -242,6 +243,7 @@ plugin.
 %patch0 -p1 -b .fix-2nd-show-splash
 %patch1 -p1 -b .fix-text-password-crash
 %patch2 -p1 -b .fix-firstboot-on-intel
+%patch3 -p1 -b .fix-firstboot-on-radeon
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -459,6 +461,11 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Wed Oct 07 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.5
+- Prevent firstboot's X from crashing on radeon hardware. This should
+  only affect multihead users, but for some reason it's getting some
+  single head users as well.
+
 * Tue Oct 06 2009 Ray Strode <rstrode at redhat.com> 0.8.0-0.2009.29.09.4
 - Prevent firstboot's X from crashing on intel hardware