rpms/kernel/F-13 thinkpad-acpi-fix-backlight.patch, NONE, 1.1 kernel.spec, 1.2036, 1.2037 thinkpad-acpi-add-x100e.patch, 1.1, 1.2

[Matthew Garrett]

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13718

Modified Files:
	kernel.spec thinkpad-acpi-add-x100e.patch 
Added Files:
	thinkpad-acpi-fix-backlight.patch 
Log Message:
* Mon May 17 2010 Matthew Garrett <mjg at redhat.com>
- thinkpad-acpi-fix-backlight.patch: Fix backlight control on some recent
   Thinkpads


thinkpad-acpi-fix-backlight.patch:
 thinkpad_acpi.c |   38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

--- NEW FILE thinkpad-acpi-fix-backlight.patch ---
diff -ur linux-2.6.33.noarch.bak/drivers/platform/x86/thinkpad_acpi.c linux-2.6.33.noarch/drivers/platform/x86/thinkpad_acpi.c
--- linux-2.6.33.noarch.bak/drivers/platform/x86/thinkpad_acpi.c	2010-05-17 15:56:10.864200185 -0400
+++ linux-2.6.33.noarch/drivers/platform/x86/thinkpad_acpi.c	2010-05-17 16:12:20.232074844 -0400
@@ -3396,7 +3396,7 @@
 		/* update bright_acpimode... */
 		tpacpi_check_std_acpi_brightness_support();
 
-	if (tp_features.bright_acpimode && acpi_video_backlight_support()) {
+	if (acpi_video_backlight_support()) {
 		printk(TPACPI_INFO
 		       "This ThinkPad has standard ACPI backlight "
 		       "brightness control, supported by the ACPI "
@@ -6187,26 +6187,24 @@
 	 * going to publish a backlight interface
 	 */
 	b = tpacpi_check_std_acpi_brightness_support();
-	if (b > 0) {
 
-		if (acpi_video_backlight_support()) {
-			if (brightness_enable > 1) {
-				printk(TPACPI_NOTICE
-				       "Standard ACPI backlight interface "
-				       "available, not loading native one.\n");
-				return 1;
-			} else if (brightness_enable == 1) {
-				printk(TPACPI_NOTICE
-				       "Backlight control force enabled, even if standard "
-				       "ACPI backlight interface is available\n");
-			}
-		} else {
-			if (brightness_enable > 1) {
-				printk(TPACPI_NOTICE
-				       "Standard ACPI backlight interface not "
-				       "available, thinkpad_acpi native "
-				       "brightness control enabled\n");
-			}
+	if (acpi_video_backlight_support()) {
+		if (brightness_enable > 1) {
+			printk(TPACPI_NOTICE
+			       "Standard ACPI backlight interface "
+			       "available, not loading native one.\n");
+			return 1;
+		} else if (brightness_enable == 1) {
+			printk(TPACPI_NOTICE
+			       "Backlight control force enabled, even if standard "
+			       "ACPI backlight interface is available\n");
+		}
+	} else {
+		if (brightness_enable > 1) {
+			printk(TPACPI_NOTICE
+			       "Standard ACPI backlight interface not "
+			       "available, thinkpad_acpi native "
+			       "brightness control enabled\n");
 		}
 	}
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.2036
retrieving revision 1.2037
diff -u -p -r1.2036 -r1.2037
--- kernel.spec	17 May 2010 17:16:13 -0000	1.2036
+++ kernel.spec	17 May 2010 20:36:40 -0000	1.2037
@@ -676,6 +676,7 @@ Patch452: linux-2.6.30-no-pcspkr-modalia
 Patch453: thinkpad-acpi-add-x100e.patch
 Patch454: linux-2.6-input-hid-quirk-egalax.patch
 Patch455: linux-2.6-input-clickpad-support.patch
+Patch456: thinkpad-acpi-fix-backlight.patch
 
 Patch460: linux-2.6-serial-460800.patch
 
@@ -1381,6 +1382,7 @@ ApplyPatch linux-2.6.30-no-pcspkr-modali
 ApplyPatch linux-2.6-input-hid-quirk-egalax.patch
 ApplyPatch linux-2.6-input-clickpad-support.patch
 ApplyPatch thinkpad-acpi-add-x100e.patch
+ApplyPatch thinkpad-acpi-fix-backlight.patch
 
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
@@ -2194,6 +2196,10 @@ fi
 # and build.
 
 %changelog
+* Mon May 17 2010 Matthew Garrett <mjg at redhat.com>
+- thinkpad-acpi-fix-backlight.patch: Fix backlight control on some recent
+   Thinkpads
+
 * Mon May 17 2010 Kyle McMartin <kyle at redhat.com> 2.6.33.4-97
 - perf-mount-debugfs-automatically.patch (#570821)
 

thinkpad-acpi-add-x100e.patch:
 thinkpad_acpi.c |    1 +
 1 file changed, 1 insertion(+)

Index: thinkpad-acpi-add-x100e.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/thinkpad-acpi-add-x100e.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- thinkpad-acpi-add-x100e.patch	21 Apr 2010 14:13:18 -0000	1.1
+++ thinkpad-acpi-add-x100e.patch	17 May 2010 20:36:41 -0000	1.2
@@ -8,4 +8,3 @@ diff -up linux-2.6.33.noarch/drivers/pla
 +	   "\\_SB.PCI0.LPC0.EC",	/* X100e */
  	   "\\_SB.PCI0.LPC.EC",	/* all others */
  	   );
-