From 3b881c2faabf338554bd3ddac0e7d0ac307cc93d Mon Sep 17 00:00:00 2001 From: Henrique de Moraes Holschuh Date: Sat, 15 Nov 2008 10:51:16 -0200 Subject: [PATCH] Add patch accepted for 2.6.28-rc5 Signed-off-by: Henrique de Moraes Holschuh --- ...acpi-fingers-off-backlight-if-video.ko-is.patch | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 releases/upstream/2.6.28-rc5/0001-thinkpad_acpi-fingers-off-backlight-if-video.ko-is.patch diff --git a/releases/upstream/2.6.28-rc5/0001-thinkpad_acpi-fingers-off-backlight-if-video.ko-is.patch b/releases/upstream/2.6.28-rc5/0001-thinkpad_acpi-fingers-off-backlight-if-video.ko-is.patch new file mode 100644 index 00000000000..3e189c7a0ef --- /dev/null +++ b/releases/upstream/2.6.28-rc5/0001-thinkpad_acpi-fingers-off-backlight-if-video.ko-is.patch @@ -0,0 +1,57 @@ +From 2dba1b5d87e08a294da5cdfa4d32908000e9b085 Mon Sep 17 00:00:00 2001 +From: Thomas Renninger +Date: Fri, 1 Aug 2008 17:38:03 +0200 +Subject: [PATCH] thinkpad_acpi: fingers off backlight if video.ko is serving this functionality + +Signed-off-by: Thomas Renninger +Acked-by: Zhang Rui +Acked-by: Henrique de Moraes Holschuh +Signed-off-by: Andi Kleen +Signed-off-by: Len Brown +--- + drivers/misc/thinkpad_acpi.c | 29 +++++++++++++++++++---------- + 1 files changed, 19 insertions(+), 10 deletions(-) + +diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c +index 4db1cf9..7a4a26b 100644 +--- a/drivers/misc/thinkpad_acpi.c ++++ b/drivers/misc/thinkpad_acpi.c +@@ -4932,16 +4932,25 @@ static int __init brightness_init(struct ibm_init_struct *iibm) + */ + b = tpacpi_check_std_acpi_brightness_support(); + if (b > 0) { +- if (thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO) { +- printk(TPACPI_NOTICE +- "Lenovo BIOS switched to ACPI backlight " +- "control mode\n"); +- } +- if (brightness_enable > 1) { +- printk(TPACPI_NOTICE +- "standard ACPI backlight interface " +- "available, not loading native one...\n"); +- return 1; ++ ++ 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"); ++ } + } + } + +-- +1.5.6.5 + -- 2.11.4.GIT