summaryrefslogtreecommitdiff
path: root/src/i830_lvds.c
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2008-03-28 13:23:02 -0700
committerroot <root@debian-hp.(none)>2008-03-30 21:43:46 +0800
commitca694544247695864493ce67613f07bb19d272fd (patch)
tree85e797e34c07b582bfea35e8e587951bed1430dc /src/i830_lvds.c
parentdafda8b4582c218782da59d5ac3c82a70a91762f (diff)
Use combo backlight control rather than pure legacy
If the legacy bit is set, use both the BLC_PWM_CTL and LBB regs to control the backlight, rather than just LBB. Looks like more platforms want that than what the current code does. Note that kernel provided interfaces will always be used if available, so this shouldn't affect users with /sys/class/backlight interfaces at all. Fixes #14721. (cherry picked from commit 1450acd046d47e1739a3ffbd146c73ad2974a935)
Diffstat (limited to 'src/i830_lvds.c')
-rw-r--r--src/i830_lvds.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_lvds.c b/src/i830_lvds.c
index 28a51d98..33b4f269 100644
--- a/src/i830_lvds.c
+++ b/src/i830_lvds.c
@@ -133,11 +133,11 @@ i830_set_lvds_backlight_method(xf86OutputPtr output)
} else if (IS_I965GM(pI830) || IS_IGD_GM(pI830)) {
blc_pwm_ctl2 = INREG(BLC_PWM_CTL2);
if (blc_pwm_ctl2 & BLM_LEGACY_MODE2)
- method = BCM_LEGACY;
+ method = BCM_COMBO;
} else {
blc_pwm_ctl = INREG(BLC_PWM_CTL);
if (blc_pwm_ctl & BLM_LEGACY_MODE)
- method = BCM_LEGACY;
+ method = BCM_COMBO;
}
pI830->backlight_control_method = method;