]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/suse-2.6.27.31/patches.arch/0009-thinkpad_acpi-fingers-off-backlight.patch
Revert "Disable build of xen kernel."
[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.arch / 0009-thinkpad_acpi-fingers-off-backlight.patch
1 From: Thomas Renninger <trenn@suse.de>
2 Subject: [PATCH] thinkpad_acpi: fingers off backlight if video.ko is serving this functionality
3 Patch-Mainline: queued for .28 in Len's/ak's ACPI tree
4
5 commit bcca9a4a97b6e270793003d745d6f9439e1357a8
6
7 Signed-off-by: Thomas Renninger <trenn@suse.de>
8 Signed-off-by: Andi Kleen <ak@linux.intel.com>
9 ---
10 drivers/misc/thinkpad_acpi.c | 29 +++++++++++++++++++----------
11 1 file changed, 19 insertions(+), 10 deletions(-)
12
13 --- a/drivers/misc/thinkpad_acpi.c
14 +++ b/drivers/misc/thinkpad_acpi.c
15 @@ -4918,16 +4918,25 @@ static int __init brightness_init(struct
16 */
17 b = tpacpi_check_std_acpi_brightness_support();
18 if (b > 0) {
19 - if (thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO) {
20 - printk(TPACPI_NOTICE
21 - "Lenovo BIOS switched to ACPI backlight "
22 - "control mode\n");
23 - }
24 - if (brightness_enable > 1) {
25 - printk(TPACPI_NOTICE
26 - "standard ACPI backlight interface "
27 - "available, not loading native one...\n");
28 - return 1;
29 +
30 + if (acpi_video_backlight_support()) {
31 + if (brightness_enable > 1) {
32 + printk(TPACPI_NOTICE
33 + "Standard ACPI backlight interface "
34 + "available, not loading native one.\n");
35 + return 1;
36 + } else if (brightness_enable == 1) {
37 + printk(TPACPI_NOTICE
38 + "Backlight control force, even standard "
39 + "ACPI backlight interface available\n");
40 + }
41 + } else {
42 + if (brightness_enable > 1) {
43 + printk(TPACPI_NOTICE
44 + "Standard ACPI backlight interface not "
45 + "available, thinkpad_acpi driver "
46 + "will take over control\n");
47 + }
48 }
49 }
50