* [PATCH] drm/i915: set backlight duty cycle after backlight enable for gen4
@ 2014-06-09 15:24 Jani Nikula
2014-06-10 7:25 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Jani Nikula @ 2014-06-09 15:24 UTC (permalink / raw)
To: intel-gfx; +Cc: Stable, mcy, Marc Milgram, 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
commit b35684b8fa94e04f55fd38bf672b737741d2f9e2
Author: Jani Nikula <jani.nikula@intel.com>
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
Reported-and-tested-by: mcy@lm7.fr
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79423
Reported-and-tested-by: Marc Milgram <mmilgram@redhat.com>
Cc: Stable <stable@vger.kernel.org> # 3.14+
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_panel.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 5e6c888b4928..38a98570d10c 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -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)
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915: set backlight duty cycle after backlight enable for gen4
2014-06-09 15:24 [PATCH] drm/i915: set backlight duty cycle after backlight enable for gen4 Jani Nikula
@ 2014-06-10 7:25 ` Daniel Vetter
2014-06-10 16:40 ` Jani Nikula
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2014-06-10 7:25 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, Stable, Marc Milgram, mcy
On Mon, Jun 09, 2014 at 06:24:34PM +0300, Jani Nikula wrote:
> 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 <jani.nikula@intel.com>
> 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
> Reported-and-tested-by: mcy@lm7.fr
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79423
> Reported-and-tested-by: Marc Milgram <mmilgram@redhat.com>
> Cc: Stable <stable@vger.kernel.org> # 3.14+
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Yeah, docs don't mention anything. But if it works it's fine, so
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/intel_panel.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
> index 5e6c888b4928..38a98570d10c 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -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)
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: set backlight duty cycle after backlight enable for gen4
2014-06-10 7:25 ` Daniel Vetter
@ 2014-06-10 16:40 ` Jani Nikula
0 siblings, 0 replies; 3+ messages in thread
From: Jani Nikula @ 2014-06-10 16:40 UTC (permalink / raw)
To: Daniel Vetter; +Cc: intel-gfx, Stable, Marc Milgram, mcy
On Tue, 10 Jun 2014, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Mon, Jun 09, 2014 at 06:24:34PM +0300, Jani Nikula wrote:
>> 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 <jani.nikula@intel.com>
>> 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
>> Reported-and-tested-by: mcy@lm7.fr
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79423
>> Reported-and-tested-by: Marc Milgram <mmilgram@redhat.com>
>> Cc: Stable <stable@vger.kernel.org> # 3.14+
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Yeah, docs don't mention anything. But if it works it's fine, so
> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
With that, pushed to -fixes.
BR,
Jani.
>
>> ---
>> drivers/gpu/drm/i915/intel_panel.c | 5 ++---
>> 1 file changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
>> index 5e6c888b4928..38a98570d10c 100644
>> --- a/drivers/gpu/drm/i915/intel_panel.c
>> +++ b/drivers/gpu/drm/i915/intel_panel.c
>> @@ -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)
>> --
>> 1.9.1
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-10 16:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-09 15:24 [PATCH] drm/i915: set backlight duty cycle after backlight enable for gen4 Jani Nikula
2014-06-10 7:25 ` Daniel Vetter
2014-06-10 16:40 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox