drm/i915: set backlight duty cycle after backlight enable for gen4
Subsystems (2)
PATCH 1/1 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.
This fixes a regression introduced by
commit b35684b8fa94e04f55fd38bf672b737741d2f9e2
Author: Jani Nikula <[email protected]> Date: Thu Nov 14 12:13:41 2013 +0200
drm/i915: do full backlight setup at enable time
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=75791
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79423
--- drivers/gpu/drm/i915/intel_panel.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_panel.c +2 -3
@@ -798,9 +798,6 @@ static void i965_enable_backlight(struct intel_connector *connector) 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 ;
@@ -809,6 +806,8 @@ static void i965_enable_backlight(struct intel_connector *connector)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)
Signature · 1 line
1.9.1
Quoted 10 lines · Jani Nikula
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.
This fixes a regression introduced by
commitb35684b8fa94e04f55fd38bf672b737741d2f9e2Author: Jani Nikula <[email protected]> Date: Thu Nov 14 12:13:41 2013 +0200
Quoted 8 lines
drm/i915: do full backlight setup at enable time
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=75791
Reported-and-tested-by [email protected]Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79423
Reported-and-tested-by Marc Milgram <[email protected]>Cc Stable <[email protected]> # 3.14+Signed-off-by Jani Nikula <[email protected]>
Yeah, docs don't mention anything. But if it works it's fine, so
Quoted 34 lines
--- drivers/gpu/drm/i915/intel_panel.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_panel.c +2
-3@@ -798,9 +798,6 @@ static void i965_enable_backlight(struct intel_connector *connector) 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 ;@@ -809,6 +806,8 @@ static void i965_enable_backlight(struct intel_connector *connector)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)Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 20 lines · Daniel Vetter
Quoted 10 lines · Jani Nikula
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.
This fixes a regression introduced by
commitb35684b8fa94e04f55fd38bf672b737741d2f9e2Author: Jani Nikula <[email protected]> Date: Thu Nov 14 12:13:41 2013 +0200Quoted 8 lines
drm/i915: do full backlight setup at enable time
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=75791
Reported-and-tested-by [email protected]Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79423
Reported-and-tested-by Marc Milgram <[email protected]>Cc Stable <[email protected]> # 3.14+Signed-off-by Jani Nikula <[email protected]>
Quoted 2 lines
Yeah, docs don't mention anything. But if it works it's fine, so
Acked-by Daniel Vetter <[email protected]>
With that, pushed to -fixes.
BR,
Jani.
Quoted 40 lines
Quoted 35 lines
--- drivers/gpu/drm/i915/intel_panel.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_panel.c +2
-3@@ -798,9 +798,6 @@ static void i965_enable_backlight(struct intel_connector *connector) 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 ;@@ -809,6 +806,8 @@ static void i965_enable_backlight(struct intel_connector *connector)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)Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center