rpms/pm-utils/devel pm-utils-1.2.2.1-radeon-kms.patch, NONE, 1.1 pm-utils.spec, 1.111, 1.112

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4511

Modified Files:
	pm-utils.spec 
Added Files:
	pm-utils-1.2.2.1-radeon-kms.patch 
Log Message:
* Tue Nov 04 2008 Richard Hughes <rhughes at redhat.com> - 1.2.2.1-2
- Add a patch from airlied to disable quirks when radeon is being used with KMS.


pm-utils-1.2.2.1-radeon-kms.patch:

--- NEW FILE pm-utils-1.2.2.1-radeon-kms.patch ---
diff -up pm-utils-1.2.2.1/pm/sleep.d/98smart-kernel-video.da pm-utils-1.2.2.1/pm/sleep.d/98smart-kernel-video
--- pm-utils-1.2.2.1/pm/sleep.d/98smart-kernel-video.da	2008-11-03 08:58:37.000000000 +1000
+++ pm-utils-1.2.2.1/pm/sleep.d/98smart-kernel-video	2008-11-03 09:07:10.000000000 +1000
@@ -52,6 +52,28 @@ smart_kernel_fglrx()
 	--quirk-pci-save
 }
 
+smart_kernel_radeon()
+{
+    # if kernel modesetting is enabled let the kernel deal with it all
+    [ -d /sys/module/radeon ] || return 1
+    [ -f /sys/module/radeon/parameters/modeset ] || return 1
+    local modeset=`cat /sys/module/radeon/parameters/modeset`
+    [ "$modeset" = "1" ] || return 1
+    remove_parameters --quirk-dpms-on \
+    	--quirk-dpms-suspend \
+	--quirk-s3-mode \
+    	--quirk-s3-bios \
+	--quirk-vbe-post \
+	--quirk-vbe-post \
+	--quirk-vga-mode3 \
+	--quirk-vbemode-restore \
+	--quirk-vbestate-restore \
+	--quirk-reset-brightness \
+	--quirk-radeon-off \
+	--quirk-no-fb \
+	--quirk-pci-save
+}
+
 smart_kernel_intel()
 {
     # currently, intel kernel modesetting is not quite smart enough
@@ -77,7 +99,7 @@ smart_kernel_intel()
 smart_kernel_video() 
 {
         smart_kernel_nvidia || smart_kernel_fglrx || smart_kernel_intel || \
-	return $NA
+	smart_kernel_radeon || return $NA
 }
 
 case $1 in


Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- pm-utils.spec	13 Oct 2008 12:46:58 -0000	1.111
+++ pm-utils.spec	4 Nov 2008 12:30:32 -0000	1.112
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 1.2.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 # for chvt
@@ -23,7 +23,8 @@
 Source22: pm-utils-hd-apm-restore.conf
 Source23: pm-utils-bugreport-info.sh
 
-#Patch1: pm-utils-1.1.0-default-to-shutdown.patch
+# not yet upstream as the radeon code isn't upstream yet
+Patch1: pm-utils-1.2.2.1-radeon-kms.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,7 +46,7 @@
 
 %prep
 %setup -q 
-#%patch1 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -107,6 +108,9 @@
 
 
 %changelog
+* Tue Nov 04 2008 Richard Hughes <rhughes at redhat.com> - 1.2.2.1-2
+- Add a patch from airlied to disable quirks when radeon is being used with KMS.
+
 * Mon Oct 13 2008 Richard Hughes <rhughes at redhat.com> - 1.2.2.1-1
 - Update to 1.2.2.1
 - Supports automatically pulling quirks from HAL and has the ability to save