Module Name: src
Committed By: jmcneill
Date: Tue Nov 4 03:05:36 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_panel.c
Log Message:
Merge
https://github.com/torvalds/linux/commit/2e7eeeb59a92d09144fdb7d2dc1af77a10a7945b#diff-528092536eaeb3c5f7ff6dfeed53786d
> drm/i915: set backlight duty cycle after backlight enable for gen4
> For reasons I can't claim to fully understand gen4 seems to require
> backlight duty cycle setting after the backlight has been enabled, or
> else black screen follows. I don't have documentation for the correct
> sequence on gen4 either. Confirmed on Dell Latitude D630 and MacBook4,1.
Without this patch, the screen on my T61 (i965) would be blank at boot
unless I booted with the AC adapter unplugged.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.5 Sun Sep 7 23:03:11 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c Tue Nov 4 03:05:36 2014
@@ -730,9 +730,6 @@ static void i965_enable_backlight(struct
ctl = freq << 16;
I915_WRITE(BLC_PWM_CTL, ctl);
- /* XXX: combine this into above write? */
- intel_panel_actually_set_backlight(connector, panel->backlight.level);
-
ctl2 = BLM_PIPE(pipe);
if (panel->backlight.combination_mode)
ctl2 |= BLM_COMBINATION_MODE;
@@ -741,6 +738,8 @@ static void i965_enable_backlight(struct
I915_WRITE(BLC_PWM_CTL2, ctl2);
POSTING_READ(BLC_PWM_CTL2);
I915_WRITE(BLC_PWM_CTL2, ctl2 | BLM_PWM_ENABLE);
+
+ intel_panel_actually_set_backlight(connector, panel->backlight.level);
}
static void vlv_enable_backlight(struct intel_connector *connector)
