releases/upstream/2.6.28-rc5/0001-thinkpad_acpi-fingers-off-backlight-if-video.ko-is.patch

   1 From 2dba1b5d87e08a294da5cdfa4d32908000e9b085 Mon Sep 17 00:00:00 2001
   2 From: Thomas Renninger <trenn@suse.de>
   3 Date: Fri, 1 Aug 2008 17:38:03 +0200
   4 Subject: [PATCH] thinkpad_acpi: fingers off backlight if video.ko is serving this functionality
   5
   6 Signed-off-by: Thomas Renninger <trenn@suse.de>
   7 Acked-by: Zhang Rui <rui.zhang@intel.com>
   8 Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
   9 Signed-off-by: Andi Kleen <ak@linux.intel.com>
  10 Signed-off-by: Len Brown <len.brown@intel.com>
  11 ---
  12  drivers/misc/thinkpad_acpi.c |   29 +++++++++++++++++++----------
  13  1 files changed, 19 insertions(+), 10 deletions(-)
  14
  15 diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
  16 index 4db1cf9..7a4a26b 100644
  17 --- a/drivers/misc/thinkpad_acpi.c
  18 +++ b/drivers/misc/thinkpad_acpi.c
  19 @@ -4932,16 +4932,25 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
  20          */
  21         b = tpacpi_check_std_acpi_brightness_support();
  22         if (b > 0) {
  23 -               if (thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO) {
  24 -                       printk(TPACPI_NOTICE
  25 -                              "Lenovo BIOS switched to ACPI backlight "
  26 -                              "control mode\n");
  27 -               }
  28 -               if (brightness_enable > 1) {
  29 -                       printk(TPACPI_NOTICE
  30 -                              "standard ACPI backlight interface "
  31 -                              "available, not loading native one...\n");
  32 -                       return 1;
  33 +
  34 +               if (acpi_video_backlight_support()) {
  35 +                       if (brightness_enable > 1) {
  36 +                               printk(TPACPI_NOTICE
  37 +                                      "Standard ACPI backlight interface "
  38 +                                      "available, not loading native one.\n");
  39 +                               return 1;
  40 +                       } else if (brightness_enable == 1) {
  41 +                               printk(TPACPI_NOTICE
  42 +                                      "Backlight control force enabled, even if standard "
  43 +                                      "ACPI backlight interface is available\n");
  44 +                       }
  45 +               } else {
  46 +                       if (brightness_enable > 1) {
  47 +                               printk(TPACPI_NOTICE
  48 +                                      "Standard ACPI backlight interface not "
  49 +                                      "available, thinkpad_acpi native "
  50 +                                      "brightness control enabled\n");
  51 +                       }
  52                 }
  53         }
  54
  55 --
  56 1.5.6.5
  57