| Message ID | 1393326707-917-1-git-send-email-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Feb 25, 2014 at 01:11:47PM +0200, Jani Nikula wrote: > i915gm and i945gm also seem to use and need the legacy combination mode > bit in BLC_PWM_CTL. > > v2: Also do this for i915gm (Ville). > > Reported-and-tested-by: Luis Ortega <luiorpe1@gmail.com> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75001 > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Looks sane enough for me. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_panel.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c > index 5bc3f6ea1014..cb058408c70e 100644 > --- a/drivers/gpu/drm/i915/intel_panel.c > +++ b/drivers/gpu/drm/i915/intel_panel.c > @@ -689,7 +689,7 @@ static void i9xx_enable_backlight(struct intel_connector *connector) > freq /= 0xff; > > ctl = freq << 17; > - if (IS_GEN2(dev) && panel->backlight.combination_mode) > + if (panel->backlight.combination_mode) > ctl |= BLM_LEGACY_MODE; > if (IS_PINEVIEW(dev) && panel->backlight.active_low_pwm) > ctl |= BLM_POLARITY_PNV; > @@ -970,7 +970,7 @@ static int i9xx_setup_backlight(struct intel_connector *connector) > > ctl = I915_READ(BLC_PWM_CTL); > > - if (IS_GEN2(dev)) > + if (IS_GEN2(dev) || IS_I915GM(dev) || IS_I945GM(dev)) > panel->backlight.combination_mode = ctl & BLM_LEGACY_MODE; > > if (IS_PINEVIEW(dev)) > -- > 1.7.9.5
On Wed, 26 Feb 2014, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote: > On Tue, Feb 25, 2014 at 01:11:47PM +0200, Jani Nikula wrote: >> i915gm and i945gm also seem to use and need the legacy combination mode >> bit in BLC_PWM_CTL. >> >> v2: Also do this for i915gm (Ville). >> >> Reported-and-tested-by: Luis Ortega <luiorpe1@gmail.com> >> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75001 >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > Looks sane enough for me. > > Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Pushed to -fixes, thanks for the review. Jani. > >> --- >> drivers/gpu/drm/i915/intel_panel.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c >> index 5bc3f6ea1014..cb058408c70e 100644 >> --- a/drivers/gpu/drm/i915/intel_panel.c >> +++ b/drivers/gpu/drm/i915/intel_panel.c >> @@ -689,7 +689,7 @@ static void i9xx_enable_backlight(struct intel_connector *connector) >> freq /= 0xff; >> >> ctl = freq << 17; >> - if (IS_GEN2(dev) && panel->backlight.combination_mode) >> + if (panel->backlight.combination_mode) >> ctl |= BLM_LEGACY_MODE; >> if (IS_PINEVIEW(dev) && panel->backlight.active_low_pwm) >> ctl |= BLM_POLARITY_PNV; >> @@ -970,7 +970,7 @@ static int i9xx_setup_backlight(struct intel_connector *connector) >> >> ctl = I915_READ(BLC_PWM_CTL); >> >> - if (IS_GEN2(dev)) >> + if (IS_GEN2(dev) || IS_I915GM(dev) || IS_I945GM(dev)) >> panel->backlight.combination_mode = ctl & BLM_LEGACY_MODE; >> >> if (IS_PINEVIEW(dev)) >> -- >> 1.7.9.5 > > -- > Ville Syrjälä > Intel OTC
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index 5bc3f6ea1014..cb058408c70e 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -689,7 +689,7 @@ static void i9xx_enable_backlight(struct intel_connector *connector) freq /= 0xff; ctl = freq << 17; - if (IS_GEN2(dev) && panel->backlight.combination_mode) + if (panel->backlight.combination_mode) ctl |= BLM_LEGACY_MODE; if (IS_PINEVIEW(dev) && panel->backlight.active_low_pwm) ctl |= BLM_POLARITY_PNV; @@ -970,7 +970,7 @@ static int i9xx_setup_backlight(struct intel_connector *connector) ctl = I915_READ(BLC_PWM_CTL); - if (IS_GEN2(dev)) + if (IS_GEN2(dev) || IS_I915GM(dev) || IS_I945GM(dev)) panel->backlight.combination_mode = ctl & BLM_LEGACY_MODE; if (IS_PINEVIEW(dev))
i915gm and i945gm also seem to use and need the legacy combination mode bit in BLC_PWM_CTL. v2: Also do this for i915gm (Ville). Reported-and-tested-by: Luis Ortega <luiorpe1@gmail.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75001 Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/intel_panel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)