rpms/kernel/devel kernel-2.6.spec, 1.2000, 1.2001 linux-2.6-radeon-backlight.patch, 1.14, 1.15 linux-2.6-radeon-whitelist.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Mar 1 19:15:29 UTC 2006
Author: pjones
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8951
Modified Files:
kernel-2.6.spec linux-2.6-radeon-backlight.patch
Removed Files:
linux-2.6-radeon-whitelist.patch
Log Message:
- actually, don't use a separate patch, use #include instead.
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2000
retrieving revision 1.2001
diff -u -r1.2000 -r1.2001
--- kernel-2.6.spec 1 Mar 2006 18:15:08 -0000 1.2000
+++ kernel-2.6.spec 1 Mar 2006 19:15:24 -0000 1.2001
@@ -354,7 +354,6 @@
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
@@ -914,8 +913,6 @@
%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 ++++++++++++++++++++++++++++++++-
radeon_pm_whitelist.h | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 137 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-radeon-backlight.patch 1 Mar 2006 18:15:08 -0000 1.14
+++ linux-2.6-radeon-backlight.patch 1 Mar 2006 19:15:24 -0000 1.15
@@ -1,8 +1,84 @@
-
-http://bugme.osdl.org/show_bug.cgi?id=3022
-
---- 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
+--- linux-2.6.15.i686/drivers/video/aty/radeon_pm_whitelist.h.backlight 2006-03-01 13:22:58.000000000 -0500
++++ linux-2.6.15.i686/drivers/video/aty/radeon_pm_whitelist.h 2006-03-01 13:56:54.000000000 -0500
+@@ -0,0 +1,76 @@
++#define E(_vendor, _product, _ident, _reporter) \
++{ /* _reporter */ \
++ .ident = _ident, \
++ .matches = { \
++ DMI_MATCH(DMI_SYS_VENDOR, _vendor), \
++ DMI_MATCH(DMI_PRODUCT_NAME, _product), \
++ }, \
++}
++E("IBM", "18297RG", "IBM ThinkPad R50", "Borschuk Oleg <merlinse at yandex.ru>"),
++E("IBM", "18299MG", "IBM ThinkPad R51", "Georges Herber <gherber at gmail.com>"),
++E("IBM", "1829EHG", "IBM ThinkPad R51", "Wouter Cloetens <wouter at mind.be>"),
++E("IBM", "1829R6G", "IBM ThinkPad R51", "Sten Heinze"),
++E("IBM", "1836Q6U", "IBM ThinkPad R51", "Eugene Pavlovsky"),
++E("IBM", "236696G", "IBM ThinkPad T30", "Jakob Schiotz <schiotz at fysik.dtu.dk>"),
++E("IBM", "236697G", "IBM ThinkPad T30", "Stephan Groß <st.gross at inf.tu-dresden.de>"),
++E("IBM", "2366JBG", "IBM ThinkPad T30", "Thomas M Steenholdt <tmus at tmus.dk>"),
++E("IBM", "2366MU9", "IBM ThinkPad T30", "Phillip Jones <philljones at us.ibm.com>"),
++E("IBM", "2366QU5", "IBM ThinkPad T30", "ChazeFroy <chazefroy at gmail.com>"),
++E("IBM", "23729CU", "IBM ThinkPad T40", "George Avrunin <avrunin at math.umass.edu>"),
++E("IBM", "237314U", "IBM ThinkPad T40", "Dmitriy Zavin <dzavin at yahoo.com>"),
++E("IBM", "23731FG", "IBM ThinkPad T41", "Aivo Prykk <aivo.prykk at mail.ee>"),
++E("IBM", "237322G", "IBM ThinkPad T40", "Michele Lamarca <lammic at gmail.com>"),
++E("IBM", "237325G", "IBM ThinkPad T40", "Klaus Kurzmann <mok at fluxnetz.de>"),
++E("IBM", "23732FG", "IBM ThinkPad T41", "Antti Andreimann <Antti.Andreimann at mail.ee>"),
++E("IBM", "23733HM", "IBM ThinkPad T41", "Grahame Bowland <grahame at angrygoats.net>"),
++E("IBM", "23734G2", "IBM ThinkPad T40", "Antti P Miettinen <apm at brigitte.dna.fi>"),
++E("IBM", "23737JU", "IBM ThinkPad T41", "Matthew Saltzman <mjs at clemson.edu>"),
++E("IBM", "23738CG", "IBM ThinkPad T40", "Pete Toscano <pete at verisignlabs.com>"),
++E("IBM", "237392G", "IBM ThinkPad T40", "Pete Toscano <pete at verisignlabs.com>"),
++E("IBM", "237394G", "IBM ThinkPad T40", "Manuel Carro <mcarro at fi.upm.es>"),
++E("IBM", "237394U", "IBM ThinkPad T40", "Pete Toscano <pete at verisignlabs.com>"),
++E("IBM", "23739FU", "IBM ThinkPad T41", "Peter Jones <pjones at redhat.com>"),
++E("IBM", "23739HG", "IBM ThinkPad T41", "Chris Vanden Berghe <Chris at VandenBerghe.org>"),
++E("IBM", "23739HU", "IBM ThinkPad T41", "Ajay Ramaswamy <ajay at ramaswamy.net>"),
++E("IBM", "2373BU7", "IBM ThinkPad T40", "Peter Jones <pjones at redhat.com>"),
++E("IBM", "2373F2G", "IBM ThinkPad T42", "Isaac Wilcox"),
++E("IBM", "2373FWG", "IBM ThinkPad T42", "Jerome Poggi <Jerome.Poggi at hsc.fr> and Pete Toscano <pete at verisignlabs.com>"),
++E("IBM", "2373G1G", "IBM ThinkPad T40p", "Juerg Billeter <j at bitron.ch>"),
++E("IBM", "2373G1U", "IBM ThinkPad T40p", "Bill Nottingham <notting at redhat.com>"),
++E("IBM", "2373G3G", "IBM ThinkPad T40p", "Hartwig, Thomas <t.hartwig at itth.com>"),
++E("IBM", "2373GEU", "IBM ThinkPad T41p", "Eric Benson <eric_a_benson at yahoo.com>"),
++E("IBM", "2373HU6", "IBM ThinkPad T41", "David Zeuthen <davidz at redhat.com>"),
++E("IBM", "2373JTU", "IBM ThinkPad T42", "Dwight Barkley <barkley at maths.warwick.ac.uk>"),
++E("IBM", "2373MU4", "IBM ThinkPad T40", "Vernon Mauery <vernux at us.ibm.com>"),
++E("IBM", "2373RU1", "IBM ThinkPad T40", "Adam Glasgall <adam at simons-rock.edu>"),
++E("IBM", "2373TG5", "IBM ThinkPad T41", "Paul Ionescu <i_p_a_u_l at yahoo.com>"),
++E("IBM", "2373XNX", "IBM ThinkPad T41", "Ajay Ramaswamy <ajay at ramaswamy.net>"),
++E("IBM", "23746VU", "IBM ThinkPad T42", "Tim Hull <thully at cyberspace.org>"),
++E("IBM", "2374CTO", "IBM ThinkPad T42", "Johannes Hansen"),
++E("IBM", "2374ZEP", "IBM ThinkPad T42", "Johannes Hansen"),
++E("IBM", "2378DEU", "IBM ThinkPad T41", "obi <graziano at cs.ucsb.edu>"),
++E("IBM", "2378DLU", "IBM ThinkPad T41", "Paul Stanisci <paul at stanisci.ca>"),
++E("IBM", "2378DUU", "IBM ThinkPad T42", "Austin Clements <amdragon+osdlbugzilla at mit.edu>"),
++E("IBM", "2378R2U", "IBM ThinkPad T42", "Ulrich Drepper <drepper at redhat.com>"),
++E("IBM", "2378RBF", "IBM ThinkPad T42", "Nicolas Dufresne <nicolas.dufresne at usherbrooke.ca>"),
++E("IBM", "2378RBU", "IBM ThinkPad T42", "Nicolas Dufresne <nicolas.dufresne at usherbrooke.ca>"),
++E("IBM", "2378XXE", "IBM ThinkPad T42", "Tom Marshall"),
++E("IBM", "2379D6U", "IBM ThinkPad T41", "anonymous"),
++E("IBM", "2379DJU", "IBM ThinkPad T41", "Volker Braun <vbraun at physics.upenn.edu>"),
++E("IBM", "2658BQG", "IBM ThinkPad R32", "Frank Otto <Frank.Otto at tc.pci.uni-heidelberg.de>"),
++E("IBM", "26725KU", "IBM ThinkPad X31", "Chris Lee <clee at redhat.com>"),
++E("IBM", "2672A9U", "IBM ThinkPad X31", "Jeremy Katz <katzj at redhat.com>"),
++E("IBM", "2672JHG", "IBM ThinkPad X31", "Daniel P. Berrange <berrange at redhat.com>"),
++E("IBM", "2672RU3", "IBM ThinkPad X31", "Chris Blizzard <blizzard at redhat.com>"),
++ /* IBM ThinkPad X31 2672-XXH -> works, but doesn't fix the LCD
++ backlight on during S3 issue. */
++E("IBM", "2672XXH", "IBM ThinkPad X31", "Henrik Brix Andersen <brix at gentoo.org>"),
++E("IBM", "27223GG", "IBM ThinkPad R40", "Frank Schmitt <tonne2004 at gehheimdienst.de>"),
++E("IBM", "27225MG", "IBM ThinkPad R40", "Nils Trebing <nils.trebing at uni-konstanz.de>"),
++E("IBM", "27226YU", "IBM ThinkPad R40", "Rushi Bhatt"),
++E("IBM", "2722B3G", "IBM ThinkPad R40", "Pete Toscano <pete at verisignlabs.com>"),
++E("IBM", "2722CDG", "IBM ThinkPad R40", "Meik Hellmund <hellmund at math.uni-leipzig.de>"),
++{ },
++/* Negative reports: */
++/* E("IBM", "2373KUU", "IBM ThinkPad T42p", "Dax Kelson <dax at gurulabs.com>"), */
++#undef E
+--- linux-2.6.15.i686/drivers/video/aty/radeon_pm.c.backlight 2006-03-01 13:22:06.000000000 -0500
++++ linux-2.6.15.i686/drivers/video/aty/radeon_pm.c 2006-03-01 13:33:47.000000000 -0500
@@ -25,8 +25,26 @@
#include <asm/pmac_feature.h>
#endif
@@ -21,7 +97,7 @@
+ * vendor and product codes for Your laptop.
+ */
+static struct dmi_system_id __devinitdata radeonfb_dmi_table[] = {
-+ { },
++#include "radeon_pm_whitelist.h"
+};
+
+extern int radeon_force_sleep;
@@ -30,7 +106,7 @@
static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo)
{
u32 tmp;
-@@ -852,7 +870,14 @@ static void radeon_pm_setup_for_suspend(
+@@ -852,7 +870,14 @@
/* 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);
@@ -46,7 +122,7 @@
/* AGP PLL control */
if (rinfo->family <= CHIP_FAMILY_RV280) {
OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) | BUS_CNTL1__AGPCLK_VALID);
-@@ -864,6 +889,7 @@ static void radeon_pm_setup_for_suspend(
+@@ -864,6 +889,7 @@
OUTREG(BUS_CNTL1, INREG(BUS_CNTL1));
OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000);
}
@@ -54,7 +130,7 @@
OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL)
& ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN));
-@@ -2790,6 +2816,29 @@ void radeonfb_pm_init(struct radeonfb_in
+@@ -2790,6 +2816,29 @@
}
#endif /* defined(CONFIG_PPC_PMAC) */
#endif /* defined(CONFIG_PM) */
@@ -84,8 +160,8 @@
}
void radeonfb_pm_exit(struct radeonfb_info *rinfo)
---- vanilla/drivers/video/aty/radeon_base.c 2005-02-20 20:08:15.000000000 +0200
-+++ linux-2.6.14/drivers/video/aty/radeon_base.c 2005-02-20 20:18:20.000000000 +0200
+--- linux-2.6.15.i686/drivers/video/aty/radeon_base.c.backlight 2006-03-01 13:22:06.000000000 -0500
++++ linux-2.6.15.i686/drivers/video/aty/radeon_base.c 2006-03-01 13:22:27.000000000 -0500
@@ -272,6 +272,9 @@
#ifdef CONFIG_MTRR
static int nomtrr = 0;
--- linux-2.6-radeon-whitelist.patch DELETED ---
More information about the fedora-cvs-commits
mailing list