[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]
rpms/kernel/devel linux-2.6-radeon-whitelist.patch, NONE, 1.1 kernel-2.6.spec, 1.1999, 1.2000 linux-2.6-radeon-backlight.patch, 1.13, 1.14

From: fedora-cvs-commits redhat com
To: fedora-cvs-commits redhat com
Subject: rpms/kernel/devel linux-2.6-radeon-whitelist.patch, NONE, 1.1 kernel-2.6.spec, 1.1999, 1.2000 linux-2.6-radeon-backlight.patch, 1.13, 1.14
Date: Wed, 1 Mar 2006 13:15:11 -0500
Author: pjones

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31074

Modified Files:
	kernel-2.6.spec linux-2.6-radeon-backlight.patch 
Added Files:
	linux-2.6-radeon-whitelist.patch 
Log Message:
- put the radeon pm whitelist in its own patch file


linux-2.6-radeon-whitelist.patch:
 radeon_pm.c |  511 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 511 insertions(+)

--- NEW FILE linux-2.6-radeon-whitelist.patch ---
--- vanilla/drivers/video/aty/radeon_pm.c.whitelist	2006-03-01 10:36:55.000000000 -0500
+++ linux-2.6.15/drivers/video/aty/radeon_pm.c	2006-03-01 10:38:01.000000000 -0500
@@ -39,7 +39,518 @@
  * vendor and product codes for Your laptop.
  */
 static struct dmi_system_id __devinitdata radeonfb_dmi_table[] = {
+	{
+		/* Reported by Borschuk Oleg <merlinse yandex ru> */
+		.ident = "IBM ThinkPad R50 (1829-7RG)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "18297RG"),
+		},
+	},
+	{
+		/* Reported by Georges Herber <gherber gmail com> */
+		.ident = "IBM ThinkPad R51 (1829-9MG)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "18299MG"),
+		},
+	},
+	{
+		/* Reported by Wouter Cloetens <wouter mind be> */
+		.ident = "IBM ThinkPad R51 (1829-EHG)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "1829EHG"),
+		},
+	},
+	{
+		/* Reported by Sten Heinze */
+		.ident = "IBM ThinkPad R51 (1829-R6G)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "1829R6G"),
+		},
+	},
+
+	{
+		/* Reported by Eugene Pavlovsky */
+		.ident = "IBM ThinkPad R51 (1836-Q6U)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "1836Q6U"),
+		},
+	},
+
+	{
+		/* Reported by Jakob Schiotz <schiotz fysik dtu dk> */
+		.ident = "IBM ThinkPad T30 (2366-96G)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "236696G"),
+		},
+	},
+	{
+		/* Reported by Stephan GroÃ <st gross inf tu-dresden de> */
+		.ident = "IBM ThinkPad T30 (2366-97G)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "236697G"),
+		},
+	},
+	{
+		/* Reported by Thomas M Steenholdt <tmus tmus dk> */
+		.ident = "IBM ThinkPad T30 (2366-JBG)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2366JBG"),
+		},
+	},
+	{
+		/* Reported by Phillip Jones <philljones us ibm com> */
+		.ident = "IBM ThinkPad T30 (2366-MU9)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2366MU9"),
+		},
+	},
+	{
+		/* Reported by ChazeFroy <chazefroy gmail com> */
+		.ident = "IBM ThinkPad T30 (2366-QU5)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2366QU5"),
+		},
+	},
+
+	{
+		/* Reported by George Avrunin <avrunin math umass edu> */
+		.ident = "IBM ThinkPad T40 (2372-9CU)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "23729CU"),
+		},
+	},
+
+	{
+		/* Reported by Dmitriy Zavin <dzavin yahoo com> */
+		.ident = "IBM ThinkPad T40 (2373-14U)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "237314U"),
+		},
+	},
+	{
+		/* Reported by Aivo Prykk <aivo prykk mail ee> */
+		.ident = "IBM ThinkPad T41 (2373-1FG)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "23731FG"),
+		},
+	},
+	{
+		/* Reported by Michele Lamarca <lammic gmail com> */
+		.ident = "IBM ThinkPad T40 (2373-22G)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "237322G"),
+		},
+	},
+	{
+		/* Reported by Klaus Kurzmann <mok fluxnetz de> */
+		.ident = "IBM ThinkPad T40 (2373-25G)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "237325G"),
+		},
+	},
+	{
+		/* Reported by Antti Andreimann <Antti Andreimann mail ee> */
+		.ident = "IBM ThinkPad T41 (2373-2FG)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "23732FG"),
+		},
+	},
+	{
+		/* Reported by Grahame Bowland <grahame angrygoats net> */
+		.ident = "IBM ThinkPad T41 (2373-3HM)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "23733HM"),
+		},
+	},
+	{
+		/* Reported by Antti P Miettinen <apm brigitte dna fi> */
+		.ident = "IBM ThinkPad T40 (2373-4G2)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "23734G2"),
+		},
+	},
+	{
+		/* Reported by Matthew Saltzman <mjs clemson edu> */
+		.ident = "IBM ThinkPad T41 (2373-7JU)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "23737JU"),
+		},
+	},
+	{
+		/* Reported by Pete Toscano <pete verisignlabs com> */
+		.ident = "IBM ThinkPad T40 (2373-8CG)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "23738CG"),
+		},
+	},
+	{
+		/* Reported by Pete Toscano <pete verisignlabs com> */
+		.ident = "IBM ThinkPad T40 (2373-92G)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "237392G"),
+		},
+	},
+	{
+		/* Reported by Manuel Carro <mcarro fi upm es> */
+		.ident = "IBM ThinkPad T40 (2373-94G)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "237394G"),
+		},
+	},
+	{
+		/* Reported by Pete Toscano <pete verisignlabs com> */
+		.ident = "IBM ThinkPad T40 (2373-94U)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "237394U"),
+		},
+	},
+	{
+		/* Reported by Peter Jones <pjones redhat com> */
+		.ident = "IBM ThinkPad T41 (2373-9FU)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "23739FU"),
+		},
+	},
+	{
+		/* Reported by Chris Vanden Berghe <Chris VandenBerghe org> */
+		.ident = "IBM ThinkPad T41 (2373-9HG)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "23739HG"),
+		},
+	},
+	{
+		/* Reported by Ajay Ramaswamy <ajay ramaswamy net> */
+		.ident = "IBM ThinkPad T41 (2373-9HU)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "23739HU"),
+		},
+	},
+	{
+		/* Reported by Peter Jones <pjones redhat com> */
+		.ident = "IBM ThinkPad T40 (2373-BU7)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2373BU7"),
+		},
+	},
+	{
+		/* Reported by Isaac Wilcox */
+		.ident = "IBM ThinkPad T42 (2373-F2G)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2373F2G"),
+		},
+	},
+	{
+		/* Reported by Jerome Poggi <Jerome Poggi hsc fr>
+		  and Pete Toscano <pete verisignlabs com> */
+		.ident = "IBM ThinkPad T42 (2373-FWG)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2373FWG"),
+		},
+	},
+	{
+		/* Reported by Juerg Billeter <j bitron ch> */
+		.ident = "IBM ThinkPad T40p (2373-G1G)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2373G1G"),
+		},
+	},
+	{
+		/* Reported by Bill Nottingham <notting redhat com> */
+		.ident = "IBM ThinkPad T40p (2373-G1U)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2373G1U"),
+		},
+	},
+	{
+		/* Reported by Hartwig, Thomas <t hartwig itth com> */
+		.ident = "IBM ThinkPad T40p (2373-G3G)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2373G3G"),
+		},
+	},
+	{
+		/* Reported by Eric Benson <eric_a_benson yahoo com> */
+		.ident = "IBM ThinkPad T41p (2373-GEU)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2373GEU"),
+		},
+	},
+	{
+		/* Reported by David Zeuthen <davidz redhat com> */
+		.ident = "IBM ThinkPad T41 (2373-HU6)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2373HU6"),
+		},
+	},
+	{
+		/* Reported by Dwight Barkley <barkley maths warwick ac uk> */
+		.ident = "IBM ThinkPad T42 (2373-JTU)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2373JTU"),
+		},
+	},
+	{
+		/* Reported by Vernon Mauery <vernux us ibm com> */
+		.ident = "IBM ThinkPad T40 (2373-MU4)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2373MU4"),
+		},
+	},
+	{
+		/* Reported by Adam Glasgall <adam simons-rock edu> */
+		.ident = "IBM ThinkPad T40 (2373-RU1)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2373RU1"),
+		},
+	},
+	{
+		/* Reported by Paul Ionescu <i_p_a_u_l yahoo com> */
+		.ident = "IBM ThinkPad T41 (2373-TG5)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2373TG5"),
+		},
+	},
+	{
+		/* Reported by Ajay Ramaswamy <ajay ramaswamy net> */
+		.ident = "IBM ThinkPad T41 (2373-XNX)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2373XNX"),
+		},
+	},
+
+	{
+		/* Reported by Tim Hull <thully cyberspace org> */
+		.ident = "IBM ThinkPad T42 (2374-6VU)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "23746VU"),
+		},
+	},
+	{
+		/* Reported by Johannes Hansen */
+		.ident = "IBM ThinkPad T42 (2374-CTO)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2374CTO"),
+		},
+	},
+	{
+		/* Reported by Johannes Hansen */
+		.ident = "IBM ThinkPad T42 (2374-ZEP)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2374ZEP"),
+		},
+	},
+
+	{
+		/* Reported by obi <graziano cs ucsb edu> */
+		.ident = "IBM ThinkPad T41 (2378-DEU)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2378DEU"),
+		},
+	},
+	{
+		/* Reported by Paul Stanisci <paul stanisci ca> */
+		.ident = "IBM ThinkPad T41 (2378-DLU)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2378DLU"),
+		},
+	},
+	{
+		/* Reported by Austin Clements <amdragon+osdlbugzilla mit edu> */
+		.ident = "IBM ThinkPad T42 (2378-DUU)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2378DUU"),
+		},
+	},
+	{
+		/* Reported by Ulrich Drepper <drepper redhat com> */
+		.ident = "IBM ThinkPad T42 (2378-R2U)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2378R2U"),
+		},
+	},
+	{
+		/* Reported by Nicolas Dufresne <nicolas dufresne usherbrooke ca> */
+		.ident = "IBM ThinkPad T42 (2378-RBF)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2378RBF"),
+		},
+	},
+	{
+		/* Reported by Nicolas Dufresne <nicolas dufresne usherbrooke ca> */
+		.ident = "IBM ThinkPad T42 (2378-RBU)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2378RBU"),
+		},
+	},
+	{
+		/* Reported by Tom Marshall */
+		.ident = "IBM ThinkPad T42 (2378-XXE)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2378XXE"),
+		},
+	},
+
+	{
+		.ident = "IBM ThinkPad T41 (2379-D6U)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2379D6U"),
+		},
+	},
+	{
+		/* Reported by Volker Braun <vbraun physics upenn edu> */
+		.ident = "IBM ThinkPad T41 (2379-DJU)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2379DJU"),
+		},
+	},
+
+	{
+		/* Reported by Frank Otto <Frank Otto tc pci uni-heidelberg de> */
+		.ident = "IBM ThinkPad R32 (2658-BQG)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2658BQG"),
+		},
+	},
+
+	{
+		/* Reported by Chris Lee <clee redhat com> */
+		.ident = "IBM ThinkPad X31 (2672-5KU)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "26725KU"),
+		},
+	},
+	{
+		/* Reported by Jeremy Katz <katzj redhat com> */
+		.ident = "IBM ThinkPad X31 (2672-A9U)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2672A9U"),
+		},
+	},
+	{
+		/* Reported by Daniel P. Berrange <berrange redhat com> */
+		.ident = "IBM ThinkPad X31 (2672-JHG)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2672JHG"),
+		},
+	},
+	{
+		/* Reported by Chris Blizzard <blizzard redhat com> */
+		.ident = "IBM ThinkPad X31 (2672-RU3)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2672RU3"),
+		},
+	},
+	{
+		/* IBM ThinkPad X31 2672-XXH -> works, but doesn't fix the LCD 
+		   backlight on during S3 issue.
+		   Reported by: Henrik Brix Andersen <brix gentoo org> */
+		.ident = "IBM ThinkPad X31 (2672-XXH)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2672XXH"),
+		},
+	},
+
+	{
+		/* Reported by Frank Schmitt <tonne2004 gehheimdienst de> */
+		.ident = "IBM ThinkPad R40 (2722-3GG)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "27223GG"),
+		},
+	},
+	{
+		/* Reported by Nils Trebing <nils trebing uni-konstanz de> */
+		.ident = "IBM ThinkPad R40 (2722-5MG)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "27225MG"),
+		},
+	},
+	{
+		/* Reported by Rushi Bhatt */
+		.ident = "IBM ThinkPad R40 (2722-6YU)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "27226YU"),
+		},
+	},
+	{
+		/* Reported by Pete Toscano <pete verisignlabs com> */
+		.ident = "IBM ThinkPad R40 (2722-B3G)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2722B3G"),
+		},
+	},
+	{
+		/* Reported by Meik Hellmund <hellmund math uni-leipzig de> */
+		.ident = "IBM ThinkPad R40 (2722-CDG)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "2722CDG"),
+		},
+	},
 	{ },
+	/* Negative reports: */
+	/* IBM thinkpad T42p 2373-KUU -> machine hangs as X starts
+	   Reported by: Dax Kelson <dax gurulabs com> */
 };
 
 extern int radeon_force_sleep;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1999
retrieving revision 1.2000
diff -u -r1.1999 -r1.2000
--- kernel-2.6.spec	1 Mar 2006 16:54:12 -0000	1.1999
+++ kernel-2.6.spec	1 Mar 2006 18:15:08 -0000	1.2000
@@ -354,6 +354,7 @@
 Patch1610: linux-2.6-input-kill-stupid-messages.patch
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1630: linux-2.6-radeon-backlight.patch
+Patch1632: linux-2.6-radeon-whitelist.patch
 Patch1640: linux-2.6-ide-tune-locking.patch
 Patch1641: linux-2.6-ide-cd-shutup.patch
 Patch1650: linux-2.6-autofs-pathlookup.patch
@@ -913,6 +914,8 @@
 %patch1620 -p1
 # Radeon on thinkpad backlight power-management goodness.
 %patch1630 -p1
+# The whitelist for radeon thinkpad pm goodness.
+%patch1632 -p1
 # Fix IDE locking bug.
 %patch1640 -p1
 # Silence noisy CD drive spew

linux-2.6-radeon-backlight.patch:
 radeon_base.c |   11 +++++++++++
 radeon_pm.c   |   51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 1 deletion(-)

Index: linux-2.6-radeon-backlight.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-radeon-backlight.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-radeon-backlight.patch	1 Mar 2006 15:26:58 -0000	1.13
+++ linux-2.6-radeon-backlight.patch	1 Mar 2006 18:15:08 -0000	1.14
@@ -3,7 +3,7 @@
 
 --- vanilla/drivers/video/aty/radeon_pm.c	2005-10-27 20:02:08.000000000 -0400
 +++ linux-2.6.14/drivers/video/aty/radeon_pm.c	2005-11-30 02:20:01.000000000 -0500
-@@ -25,8 +25,538 @@
+@@ -25,8 +25,26 @@
  #include <asm/pmac_feature.h>
  #endif
  
@@ -21,519 +21,7 @@
 + * vendor and product codes for Your laptop.
 + */
 +static struct dmi_system_id __devinitdata radeonfb_dmi_table[] = {
-+	{
-+		/* Reported by Borschuk Oleg <merlinse yandex ru> */
-+		.ident = "IBM ThinkPad R50 (1829-7RG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "18297RG"),
-+		},
-+	},
-+	{
-+		/* Reported by Georges Herber <gherber gmail com> */
-+		.ident = "IBM ThinkPad R51 (1829-9MG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "18299MG"),
-+		},
-+	},
-+	{
-+		/* Reported by Wouter Cloetens <wouter mind be> */
-+		.ident = "IBM ThinkPad R51 (1829-EHG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "1829EHG"),
-+		},
-+	},
-+	{
-+		/* Reported by Sten Heinze */
-+		.ident = "IBM ThinkPad R51 (1829-R6G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "1829R6G"),
-+		},
-+	},
-+
-+	{
-+		/* Reported by Eugene Pavlovsky */
-+		.ident = "IBM ThinkPad R51 (1836-Q6U)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "1836Q6U"),
-+		},
-+	},
-+
-+	{
-+		/* Reported by Jakob Schiotz <schiotz fysik dtu dk> */
-+		.ident = "IBM ThinkPad T30 (2366-96G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "236696G"),
-+		},
-+	},
-+	{
-+		/* Reported by Stephan GroÃ <st gross inf tu-dresden de> */
-+		.ident = "IBM ThinkPad T30 (2366-97G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "236697G"),
-+		},
-+	},
-+	{
-+		/* Reported by Thomas M Steenholdt <tmus tmus dk> */
-+		.ident = "IBM ThinkPad T30 (2366-JBG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2366JBG"),
-+		},
-+	},
-+	{
-+		/* Reported by Phillip Jones <philljones us ibm com> */
-+		.ident = "IBM ThinkPad T30 (2366-MU9)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2366MU9"),
-+		},
-+	},
-+	{
-+		/* Reported by ChazeFroy <chazefroy gmail com> */
-+		.ident = "IBM ThinkPad T30 (2366-QU5)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2366QU5"),
-+		},
-+	},
-+
-+	{
-+		/* Reported by George Avrunin <avrunin math umass edu> */
-+		.ident = "IBM ThinkPad T40 (2372-9CU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23729CU"),
-+		},
-+	},
-+
-+	{
-+		/* Reported by Dmitriy Zavin <dzavin yahoo com> */
-+		.ident = "IBM ThinkPad T40 (2373-14U)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "237314U"),
-+		},
-+	},
-+	{
-+		/* Reported by Aivo Prykk <aivo prykk mail ee> */
-+		.ident = "IBM ThinkPad T41 (2373-1FG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23731FG"),
-+		},
-+	},
-+	{
-+		/* Reported by Michele Lamarca <lammic gmail com> */
-+		.ident = "IBM ThinkPad T40 (2373-22G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "237322G"),
-+		},
-+	},
-+	{
-+		/* Reported by Klaus Kurzmann <mok fluxnetz de> */
-+		.ident = "IBM ThinkPad T40 (2373-25G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "237325G"),
-+		},
-+	},
-+	{
-+		/* Reported by Antti Andreimann <Antti Andreimann mail ee> */
-+		.ident = "IBM ThinkPad T41 (2373-2FG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23732FG"),
-+		},
-+	},
-+	{
-+		/* Reported by Grahame Bowland <grahame angrygoats net> */
-+		.ident = "IBM ThinkPad T41 (2373-3HM)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23733HM"),
-+		},
-+	},
-+	{
-+		/* Reported by Antti P Miettinen <apm brigitte dna fi> */
-+		.ident = "IBM ThinkPad T40 (2373-4G2)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23734G2"),
-+		},
-+	},
-+	{
-+		/* Reported by Matthew Saltzman <mjs clemson edu> */
-+		.ident = "IBM ThinkPad T41 (2373-7JU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23737JU"),
-+		},
-+	},
-+	{
-+		/* Reported by Pete Toscano <pete verisignlabs com> */
-+		.ident = "IBM ThinkPad T40 (2373-8CG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23738CG"),
-+		},
-+	},
-+	{
-+		/* Reported by Pete Toscano <pete verisignlabs com> */
-+		.ident = "IBM ThinkPad T40 (2373-92G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "237392G"),
-+		},
-+	},
-+	{
-+		/* Reported by Manuel Carro <mcarro fi upm es> */
-+		.ident = "IBM ThinkPad T40 (2373-94G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "237394G"),
-+		},
-+	},
-+	{
-+		/* Reported by Pete Toscano <pete verisignlabs com> */
-+		.ident = "IBM ThinkPad T40 (2373-94U)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "237394U"),
-+		},
-+	},
-+	{
-+		/* Reported by Peter Jones <pjones redhat com> */
-+		.ident = "IBM ThinkPad T41 (2373-9FU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23739FU"),
-+		},
-+	},
-+	{
-+		/* Reported by Chris Vanden Berghe <Chris VandenBerghe org> */
-+		.ident = "IBM ThinkPad T41 (2373-9HG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23739HG"),
-+		},
-+	},
-+	{
-+		/* Reported by Ajay Ramaswamy <ajay ramaswamy net> */
-+		.ident = "IBM ThinkPad T41 (2373-9HU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23739HU"),
-+		},
-+	},
-+	{
-+		/* Reported by Peter Jones <pjones redhat com> */
-+		.ident = "IBM ThinkPad T40 (2373-BU7)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373BU7"),
-+		},
-+	},
-+	{
-+		/* Reported by Isaac Wilcox */
-+		.ident = "IBM ThinkPad T42 (2373-F2G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373F2G"),
-+		},
-+	},
-+	{
-+		/* Reported by Jerome Poggi <Jerome Poggi hsc fr>
-+		  and Pete Toscano <pete verisignlabs com> */
-+		.ident = "IBM ThinkPad T42 (2373-FWG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373FWG"),
-+		},
-+	},
-+	{
-+		/* Reported by Juerg Billeter <j bitron ch> */
-+		.ident = "IBM ThinkPad T40p (2373-G1G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373G1G"),
-+		},
-+	},
-+	{
-+		/* Reported by Bill Nottingham <notting redhat com> */
-+		.ident = "IBM ThinkPad T40p (2373-G1U)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373G1U"),
-+		},
-+	},
-+	{
-+		/* Reported by Hartwig, Thomas <t hartwig itth com> */
-+		.ident = "IBM ThinkPad T40p (2373-G3G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373G3G"),
-+		},
-+	},
-+	{
-+		/* Reported by Eric Benson <eric_a_benson yahoo com> */
-+		.ident = "IBM ThinkPad T41p (2373-GEU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373GEU"),
-+		},
-+	},
-+	{
-+		/* Reported by David Zeuthen <davidz redhat com> */
-+		.ident = "IBM ThinkPad T41 (2373-HU6)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373HU6"),
-+		},
-+	},
-+	{
-+		/* Reported by Dwight Barkley <barkley maths warwick ac uk> */
-+		.ident = "IBM ThinkPad T42 (2373-JTU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373JTU"),
-+		},
-+	},
-+	{
-+		/* Reported by Vernon Mauery <vernux us ibm com> */
-+		.ident = "IBM ThinkPad T40 (2373-MU4)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373MU4"),
-+		},
-+	},
-+	{
-+		/* Reported by Adam Glasgall <adam simons-rock edu> */
-+		.ident = "IBM ThinkPad T40 (2373-RU1)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373RU1"),
-+		},
-+	},
-+	{
-+		/* Reported by Paul Ionescu <i_p_a_u_l yahoo com> */
-+		.ident = "IBM ThinkPad T41 (2373-TG5)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373TG5"),
-+		},
-+	},
-+	{
-+		/* Reported by Ajay Ramaswamy <ajay ramaswamy net> */
-+		.ident = "IBM ThinkPad T41 (2373-XNX)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2373XNX"),
-+		},
-+	},
-+
-+	{
-+		/* Reported by Tim Hull <thully cyberspace org> */
-+		.ident = "IBM ThinkPad T42 (2374-6VU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "23746VU"),
-+		},
-+	},
-+	{
-+		/* Reported by Johannes Hansen */
-+		.ident = "IBM ThinkPad T42 (2374-CTO)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2374CTO"),
-+		},
-+	},
-+	{
-+		/* Reported by Johannes Hansen */
-+		.ident = "IBM ThinkPad T42 (2374-ZEP)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2374ZEP"),
-+		},
-+	},
-+
-+	{
-+		/* Reported by obi <graziano cs ucsb edu> */
-+		.ident = "IBM ThinkPad T41 (2378-DEU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2378DEU"),
-+		},
-+	},
-+	{
-+		/* Reported by Paul Stanisci <paul stanisci ca> */
-+		.ident = "IBM ThinkPad T41 (2378-DLU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2378DLU"),
-+		},
-+	},
-+	{
-+		/* Reported by Austin Clements <amdragon+osdlbugzilla mit edu> */
-+		.ident = "IBM ThinkPad T42 (2378-DUU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2378DUU"),
-+		},
-+	},
-+	{
-+		/* Reported by Ulrich Drepper <drepper redhat com> */
-+		.ident = "IBM ThinkPad T42 (2378-R2U)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2378R2U"),
-+		},
-+	},
-+	{
-+		/* Reported by Nicolas Dufresne <nicolas dufresne usherbrooke ca> */
-+		.ident = "IBM ThinkPad T42 (2378-RBF)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2378RBF"),
-+		},
-+	},
-+	{
-+		/* Reported by Nicolas Dufresne <nicolas dufresne usherbrooke ca> */
-+		.ident = "IBM ThinkPad T42 (2378-RBU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2378RBU"),
-+		},
-+	},
-+	{
-+		/* Reported by Tom Marshall */
-+		.ident = "IBM ThinkPad T42 (2378-XXE)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2378XXE"),
-+		},
-+	},
-+
-+	{
-+		.ident = "IBM ThinkPad T41 (2379-D6U)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2379D6U"),
-+		},
-+	},
-+	{
-+		/* Reported by Volker Braun <vbraun physics upenn edu> */
-+		.ident = "IBM ThinkPad T41 (2379-DJU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2379DJU"),
-+		},
-+	},
-+
-+	{
-+		/* Reported by Frank Otto <Frank Otto tc pci uni-heidelberg de> */
-+		.ident = "IBM ThinkPad R32 (2658-BQG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2658BQG"),
-+		},
-+	},
-+
-+	{
-+		/* Reported by Chris Lee <clee redhat com> */
-+		.ident = "IBM ThinkPad X31 (2672-5KU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "26725KU"),
-+		},
-+	},
-+	{
-+		/* Reported by Jeremy Katz <katzj redhat com> */
-+		.ident = "IBM ThinkPad X31 (2672-A9U)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2672A9U"),
-+		},
-+	},
-+	{
-+		/* Reported by Daniel P. Berrange <berrange redhat com> */
-+		.ident = "IBM ThinkPad X31 (2672-JHG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2672JHG"),
-+		},
-+	},
-+	{
-+		/* Reported by Chris Blizzard <blizzard redhat com> */
-+		.ident = "IBM ThinkPad X31 (2672-RU3)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2672RU3"),
-+		},
-+	},
-+	{
-+		/* IBM ThinkPad X31 2672-XXH -> works, but doesn't fix the LCD 
-+		   backlight on during S3 issue.
-+		   Reported by: Henrik Brix Andersen <brix gentoo org> */
-+		.ident = "IBM ThinkPad X31 (2672-XXH)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2672XXH"),
-+		},
-+	},
-+
-+	{
-+		/* Reported by Frank Schmitt <tonne2004 gehheimdienst de> */
-+		.ident = "IBM ThinkPad R40 (2722-3GG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "27223GG"),
-+		},
-+	},
-+	{
-+		/* Reported by Nils Trebing <nils trebing uni-konstanz de> */
-+		.ident = "IBM ThinkPad R40 (2722-5MG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "27225MG"),
-+		},
-+	},
-+	{
-+		/* Reported by Rushi Bhatt */
-+		.ident = "IBM ThinkPad R40 (2722-6YU)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "27226YU"),
-+		},
-+	},
-+	{
-+		/* Reported by Pete Toscano <pete verisignlabs com> */
-+		.ident = "IBM ThinkPad R40 (2722-B3G)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2722B3G"),
-+		},
-+	},
-+	{
-+		/* Reported by Meik Hellmund <hellmund math uni-leipzig de> */
-+		.ident = "IBM ThinkPad R40 (2722-CDG)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "2722CDG"),
-+		},
-+	},
-+
 +	{ },
-+	/* Negative reports: */
-+	/* IBM thinkpad T42p 2373-KUU -> machine hangs as X starts
-+	   Reported by: Dax Kelson <dax gurulabs com> */
 +};
 +
 +extern int radeon_force_sleep;
@@ -542,7 +30,7 @@
  static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo)
  {
  	u32 tmp;
-@@ -852,7 +1375,14 @@ static void radeon_pm_setup_for_suspend(
+@@ -852,7 +870,14 @@ static void radeon_pm_setup_for_suspend(
  	/* because both INPLL and OUTPLL take the same lock, that's why. */
  	tmp = INPLL( pllMCLK_MISC) | MCLK_MISC__EN_MCLK_TRISTATE_IN_SUSPEND;
  	OUTPLL( pllMCLK_MISC, tmp);
@@ -558,7 +46,7 @@
  	/* AGP PLL control */
  	if (rinfo->family <= CHIP_FAMILY_RV280) {
  		OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) |  BUS_CNTL1__AGPCLK_VALID);
-@@ -864,6 +1394,7 @@ static void radeon_pm_setup_for_suspend(
+@@ -864,6 +889,7 @@ static void radeon_pm_setup_for_suspend(
  		OUTREG(BUS_CNTL1, INREG(BUS_CNTL1));
  		OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000);
  	}
@@ -566,7 +54,7 @@
  
  	OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL)
  				  & ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN));
-@@ -2790,6 +3320,29 @@ void radeonfb_pm_init(struct radeonfb_in
+@@ -2790,6 +2816,29 @@ void radeonfb_pm_init(struct radeonfb_in
  	}
  #endif /* defined(CONFIG_PPC_PMAC) */
  #endif /* defined(CONFIG_PM) */
@@ -619,7 +107,7 @@
  		} else
  			mode_option = this_opt;
  	}
-@@ -2670,3 +2674,7 @@
+@@ -2670,3 +2677,7 @@
  MODULE_PARM_DESC(panel_yres, "int: set panel yres");
  module_param(mode_option, charp, 0);
  MODULE_PARM_DESC(mode_option, "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\" ");
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]