[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]
rpms/kernel/devel linux-2.6-radeon-backlight.patch,1.11,1.12
- From: fedora-cvs-commits redhat com
- To: fedora-cvs-commits redhat com
- Subject: rpms/kernel/devel linux-2.6-radeon-backlight.patch,1.11,1.12
- Date: Wed, 1 Mar 2006 10:16:55 -0500
Author: pjones
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13390
Modified Files:
linux-2.6-radeon-backlight.patch
Log Message:
- Today, the children learned that keeping lists sorted makes keeping track
of their contents easier.
linux-2.6-radeon-backlight.patch:
radeon_base.c | 11 +
radeon_pm.c | 555 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 565 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-radeon-backlight.patch 21 Feb 2006 20:47:21 -0000 1.11
+++ linux-2.6-radeon-backlight.patch 1 Mar 2006 15:16:52 -0000 1.12
@@ -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,532 @@
+@@ -25,8 +25,530 @@
#include <asm/pmac_feature.h>
#endif
@@ -21,126 +21,112 @@
+ * vendor and product codes for Your laptop.
+ */
+static struct dmi_system_id __devinitdata radeonfb_dmi_table[] = {
-+
+ {
-+ /* Reported by Stephan Groà <st gross inf tu-dresden de> */
-+ .ident = "IBM ThinkPad T30 (2366-97G)",
++ /* 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, "236697G"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "18297RG"),
+ },
+ },
+ {
-+ /* Reported by Phillip Jones <philljones us ibm com> */
-+ .ident = "IBM ThinkPad T30 (2366-MU9)",
++ /* 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, "2366MU9"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "18299MG"),
+ },
+ },
+ {
-+ /* Reported by Jakob Schiotz <schiotz fysik dtu dk> */
-+ .ident = "IBM ThinkPad T30 (2366-96G)",
++ /* 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, "236696G"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "1829EHG"),
+ },
+ },
+ {
-+ /* Reported by Thomas M Steenholdt <tmus tmus dk> */
-+ .ident = "IBM ThinkPad T30 (2366-JBG)",
++ /* Reported by Sten Heinze */
++ .ident = "IBM ThinkPad R51 (1829-R6G)",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "2366JBG"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "1829R6G"),
+ },
+ },
++
+ {
-+ /* Reported by ChazeFroy <chazefroy gmail com> */
-+ .ident = "IBM ThinkPad T30 (2366-QU5)",
++ /* Reported by Eugene Pavlovsky */
++ .ident = "IBM ThinkPad R51 (1836-Q6U)",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "2366QU5"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "1836Q6U"),
+ },
+ },
+
+ {
-+ /* Reported by George Avrunin <avrunin math umass edu> */
-+ .ident = "IBM ThinkPad T40 (2372-9CU)",
++ /* 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, "23729CU"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "236696G"),
+ },
+ },
+ {
-+ /* Reported by Dmitriy Zavin <dzavin yahoo com> */
-+ .ident = "IBM ThinkPad T40 (2373-14U)",
++ /* 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, "237314U"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "236697G"),
+ },
+ },
+ {
-+ /* Reported by Klaus Kurzmann <mok fluxnetz de> */
-+ .ident = "IBM ThinkPad T40 (2373-25G)",
++ /* 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, "237325G"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2366JBG"),
+ },
+ },
+ {
-+ /* 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 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 Pete Toscano <pete verisignlabs com> */
-+ .ident = "IBM ThinkPad T40 (2373-8CG)",
++ /* 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, "23738CG"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2366MU9"),
+ },
+ },
+ {
-+ /* Reported by Pete Toscano <pete verisignlabs com> */
-+ .ident = "IBM ThinkPad T40 (2373-94U)",
++ /* Reported by ChazeFroy <chazefroy gmail com> */
++ .ident = "IBM ThinkPad T30 (2366-QU5)",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "237394U"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2366QU5"),
+ },
+ },
++
+ {
-+ /* Reported by Manuel Carro <mcarro fi upm es> */
-+ .ident = "IBM ThinkPad T40 (2373-94G)",
++ /* 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, "237394G"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "23729CU"),
+ },
+ },
++
+ {
-+ /* Reported by Peter Jones <pjones redhat com> */
-+ .ident = "IBM ThinkPad T40 (2373-BU7)",
++ /* 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, "2373BU7"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "237314U"),
+ },
+ },
+ {
-+ /* Reported by Vernon Mauery <vernux us ibm com> */
-+ .ident = "IBM ThinkPad T40 (2373-MU4)",
++ /* 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, "2373MU4"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "23731FG"),
+ },
+ },
+ {
@@ -152,150 +138,150 @@
+ },
+ },
+ {
-+ /* Reported by Adam Glasgall <adam simons-rock edu> */
-+ .ident = "IBM ThinkPad T40 (2373-RU1)",
++ /* 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, "2373RU1"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "237325G"),
+ },
+ },
+ {
-+ /* Reported by Juerg Billeter <j bitron ch> */
-+ .ident = "IBM ThinkPad T40p (2373-G1G)",
++ /* 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, "2373G1G"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "23732FG"),
+ },
+ },
+ {
-+ /* Reported by Bill Nottingham <notting redhat com> */
-+ .ident = "IBM ThinkPad T40p (2373-G1U)",
++ /* 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, "2373G1U"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "23733HM"),
+ },
+ },
+ {
-+ /* Reported by Hartwig, Thomas <t hartwig itth com> */
-+ .ident = "IBM ThinkPad T40p (2373-G3G)",
++ /* 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, "2373G3G"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "23734G2"),
+ },
+ },
-+
+ {
-+ /* Reported by Antti Andreimann <Antti Andreimann mail ee> */
-+ .ident = "IBM ThinkPad T41 (2373-2FG)",
++ /* 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, "23732FG"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "23737JU"),
+ },
+ },
+ {
-+ /* Reported by Peter Jones <pjones redhat com> */
-+ .ident = "IBM ThinkPad T41 (2373-9FU)",
++ /* 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, "23739FU"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "23738CG"),
+ },
+ },
+ {
-+ /* Reported by Ajay Ramaswamy <ajay ramaswamy net> */
-+ .ident = "IBM ThinkPad T41 (2373-9HU)",
++ /* 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, "23739HU"),
-+ },
++ DMI_MATCH(DMI_PRODUCT_NAME, "237392G"),
++ },
+ },
+ {
-+ /* Reported by Ajay Ramaswamy <ajay ramaswamy net> */
-+ .ident = "IBM ThinkPad T41 (2373-XNX)",
++ /* 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, "2373XNX"),
-+ },
++ DMI_MATCH(DMI_PRODUCT_NAME, "237394G"),
++ },
+ },
+ {
-+ /* Reported by obi <graziano cs ucsb edu> */
-+ .ident = "IBM ThinkPad T41 (2378-DEU)",
++ /* 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, "2378DEU"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "237394U"),
+ },
+ },
+ {
-+ /* Reported by Volker Braun <vbraun physics upenn edu> */
-+ .ident = "IBM ThinkPad T41 (2379-DJU)",
++ /* 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, "2379DJU"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "23739FU"),
+ },
+ },
+ {
-+ /* Reported by Paul Ionescu <i_p_a_u_l yahoo com> */
-+ .ident = "IBM ThinkPad T41 (2373-TG5)",
++ /* 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, "2373TG5"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "23739HG"),
+ },
+ },
+ {
-+ /* Reported by Matthew Saltzman <mjs clemson edu> */
-+ .ident = "IBM ThinkPad T41 (2373-7JU)",
++ /* 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, "23737JU"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "23739HU"),
+ },
+ },
+ {
-+ /* Reported by David Zeuthen <davidz redhat com> */
-+ .ident = "IBM ThinkPad T41 (2373-HU6)",
++ /* 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, "2373HU6"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2373BU7"),
+ },
+ },
+ {
-+ /* Reported by Grahame Bowland <grahame angrygoats net> */
-+ .ident = "IBM ThinkPad T41 (2373-3HM)",
++ /* Reported by Isaac Wilcox */
++ .ident = "IBM ThinkPad T42 (2373-F2G)",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "23733HM"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2373F2G"),
+ },
+ },
+ {
-+ /* Reported by Aivo Prykk <aivo prykk mail ee> */
-+ .ident = "IBM ThinkPad T41 (2373-1FG)",
++ /* 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, "23731FG"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2373FWG"),
+ },
-+ },
++ }
+ {
-+ /* Reported by Chris Vanden Berghe <Chris VandenBerghe org> */
-+ .ident = "IBM ThinkPad T41 (2373-9HG)",
++ /* 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, "23739HG"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2373G1G"),
+ },
+ },
+ {
-+ /* Reported by Paul Stanisci <paul stanisci ca> */
-+ .ident = "IBM ThinkPad T41 (2378-DLU)",
++ /* 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, "2378DLU"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2373G1U"),
+ },
+ },
+ {
-+ .ident = "IBM ThinkPad T41 (2379-D6U)",
++ /* 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, "2379D6U"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2373G3G"),
+ },
+ },
-+
+ {
+ /* Reported by Eric Benson <eric_a_benson yahoo com> */
+ .ident = "IBM ThinkPad T41p (2373-GEU)",
@@ -304,13 +290,12 @@
+ DMI_MATCH(DMI_PRODUCT_NAME, "2373GEU"),
+ },
+ },
-+
+ {
-+ /* Reported by Tim Hull <thully cyberspace org> */
-+ .ident = "IBM ThinkPad T42 (2374-6VU)",
++ /* 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, "23746VU"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2373HU6"),
+ },
+ },
+ {
@@ -322,36 +307,44 @@
+ },
+ },
+ {
-+ /* Reported by Jerome Poggi <Jerome Poggi hsc fr>
-+ and Pete Toscano <pete verisignlabs com> */
-+ .ident = "IBM ThinkPad T42 (2373-FWG)",
++ /* 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, "2373FWG"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2373MU4"),
+ },
+ },
+ {
-+ /* Reported by Ulrich Drepper <drepper redhat com> */
-+ .ident = "IBM ThinkPad T42 (2378-R2U)",
++ /* 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, "2378R2U"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2373RU1"),
+ },
+ },
+ {
-+ /* Reported by Nicolas Dufresne <nicolas dufresne usherbrooke ca> */
-+ .ident = "IBM ThinkPad T42 (2378-RBF)",
++ /* 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, "2378RBF"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2373TG5"),
+ },
+ },
+ {
-+ /* Reported by Nicolas Dufresne <nicolas dufresne usherbrooke ca> */
-+ .ident = "IBM ThinkPad T42 (2378-RBU)",
++ /* 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, "2378RBU"),
++ 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"),
+ },
+ },
+ {
@@ -370,20 +363,21 @@
+ DMI_MATCH(DMI_PRODUCT_NAME, "2374ZEP"),
+ },
+ },
++
+ {
-+ /* Reported by Tom Marshall */
-+ .ident = "IBM ThinkPad T42 (2378-XXE)",
++ /* 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, "2378XXE"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2378DEU"),
+ },
+ },
+ {
-+ /* Reported by Isaac Wilcox */
-+ .ident = "IBM ThinkPad T42 (2373-F2G)",
++ /* 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, "2373F2G"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2378DLU"),
+ },
+ },
+ {
@@ -394,140 +388,144 @@
+ DMI_MATCH(DMI_PRODUCT_NAME, "2378DUU"),
+ },
+ },
-+
+ {
-+ /* Reported by Frank Otto <Frank Otto tc pci uni-heidelberg de> */
-+ .ident = "IBM ThinkPad R32 (2658-BQG)",
++ /* 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, "2658BQG"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2378R2U"),
+ },
+ },
-+
+ {
-+ /* Reported by Frank Schmitt <tonne2004 gehheimdienst de> */
-+ .ident = "IBM ThinkPad R40 (2722-3GG)",
++ /* 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, "27223GG"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2378RBF"),
+ },
+ },
+ {
-+ /* Reported by Rushi Bhatt */
-+ .ident = "IBM ThinkPad R40 (2722-6YU)",
++ /* 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, "27226YU"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2378RBU"),
+ },
+ },
+ {
-+ /* Reported by Nils Trebing <nils trebing uni-konstanz de> */
-+ .ident = "IBM ThinkPad R40 (2722-5MG)",
++ /* Reported by Tom Marshall */
++ .ident = "IBM ThinkPad T42 (2378-XXE)",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "27225MG"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2378XXE"),
+ },
+ },
++
+ {
-+ /* Reported by Meik Hellmund <hellmund math uni-leipzig de> */
-+ .ident = "IBM ThinkPad R40 (2722-CDG)",
++ .ident = "IBM ThinkPad T41 (2379-D6U)",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "2722CDG"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2379D6U"),
+ },
+ },
+ {
-+ /* Reported by Pete Toscano <pete verisignlabs com> */
-+ .ident = "IBM ThinkPad R40 (2722-B3G)",
++ /* 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, "2722B3G"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2379DJU"),
+ },
+ },
+
-+
+ {
-+ /* Reported by Borschuk Oleg <merlinse yandex ru> */
-+ .ident = "IBM ThinkPad R50 (1829-7RG)",
++ /* 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, "18297RG"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2658BQG"),
+ },
+ },
+
+ {
-+ /* Reported by Georges Herber <gherber gmail com> */
-+ .ident = "IBM ThinkPad R51 (1829-9MG)",
++ /* 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, "18299MG"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "26725KU"),
+ },
+ },
+ {
-+ /* Reported by Eugene Pavlovsky */
-+ .ident = "IBM ThinkPad R51 (1836-Q6U)",
++ /* 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, "1836Q6U"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2672A9U"),
+ },
+ },
+ {
-+ /* Reported by Sten Heinze */
-+ .ident = "IBM ThinkPad R51 (1829-R6G)",
++ /* 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, "1829R6G"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2672RU3"),
+ },
+ },
+ {
-+ /* Reported by Wouter Cloetens <wouter mind be> */
-+ .ident = "IBM ThinkPad R51 (1829-EHG)",
++ /* 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, "1829EHG"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "2672XXH"),
+ },
+ },
+
-+
+ {
-+ /* Reported by Henrik Brix Andersen <brix gentoo org> */
-+ .ident = "IBM ThinkPad X31 (2672-XXH)",
++ /* 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, "2672XXH"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "27223GG"),
+ },
+ },
+ {
-+ /* Reported by Jeremy Katz <katzj redhat com> */
-+ .ident = "IBM ThinkPad X31 (2672-A9U)",
++ /* 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, "2672A9U"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "27225MG"),
+ },
+ },
+ {
-+ /* Reported by Chris Lee <clee redhat com> */
-+ .ident = "IBM ThinkPad X31 (2672-5KU)",
++ /* Reported by Rushi Bhatt */
++ .ident = "IBM ThinkPad R40 (2722-6YU)",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "26725KU"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "27226YU"),
+ },
+ },
+ {
-+ /* Reported by Chris Blizzard <blizzard redhat com> */
-+ .ident = "IBM ThinkPad X31 (2672-RU3)",
++ /* 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, "2672RU3"),
++ 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> */
-+ /* 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> */
+};
+
+extern int radeon_force_sleep;
@@ -536,7 +534,7 @@
static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo)
{
u32 tmp;
-@@ -852,7 +1376,14 @@ static void radeon_pm_setup_for_suspend(
+@@ -852,7 +1367,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);
@@ -552,7 +550,7 @@
/* AGP PLL control */
if (rinfo->family <= CHIP_FAMILY_RV280) {
OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) | BUS_CNTL1__AGPCLK_VALID);
-@@ -864,6 +1395,7 @@ static void radeon_pm_setup_for_suspend(
+@@ -864,6 +1386,7 @@ static void radeon_pm_setup_for_suspend(
OUTREG(BUS_CNTL1, INREG(BUS_CNTL1));
OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000);
}
@@ -560,7 +558,7 @@
OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL)
& ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN));
-@@ -3322,6 +3322,29 @@ void radeonfb_pm_init(struct radeonfb_in
+@@ -2790,6 +3312,29 @@ void radeonfb_pm_init(struct radeonfb_in
}
#endif /* defined(CONFIG_PPC_PMAC) */
#endif /* defined(CONFIG_PM) */
@@ -602,7 +600,7 @@
/*
* prototypes
-@@ -2530,6 +2533,10 @@
+@@ -2615,6 +2618,10 @@
force_measure_pll = 1;
} else if (!strncmp(this_opt, "ignore_edid", 11)) {
ignore_edid = 1;
@@ -613,7 +611,7 @@
} else
mode_option = this_opt;
}
-@@ -2585,3 +2592,7 @@
+@@ -2670,3 +2674,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]