xf86-video-intel: src/i830_lvds.c

[Zhenyu Wang]

 src/i830_lvds.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8d7cbab267e8fbcb2fcf90b18346b60607277266
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Thu Dec 4 18:43:03 2008 +0800

    Fix maxium backlight level restored issue
    
    The origin check for bring back max value for '0'
    backlight level is ok for legacy or combo control method
    as '0' mostly doesn't act in ideal lowest level. But it
    breaks in using kernel control method which should provide
    a reasonable backlight range.
    
    This is tested fine on T61 with thinkpad_acpi module.

diff --git a/src/i830_lvds.c b/src/i830_lvds.c
index 239bc89..1799eab 100644
--- a/src/i830_lvds.c
+++ b/src/i830_lvds.c
@@ -400,7 +400,8 @@ i830SetLVDSPanelPower(xf86OutputPtr output, Bool on)
 	 * they'll always re-maximize the brightness.
 	 */
 	if (!(INREG(PP_CONTROL) & POWER_TARGET_ON) &&
-	    dev_priv->backlight_duty_cycle == 0)
+	    dev_priv->backlight_duty_cycle == 0 &&
+	    pI830->backlight_control_method < BCM_KERNEL)
 	    dev_priv->backlight_duty_cycle = dev_priv->backlight_max;
 
 	OUTREG(PP_CONTROL, INREG(PP_CONTROL) | POWER_TARGET_ON);