On Thu, Jan 11, 2018 at 09:48:57PM +0000, James Ausmus wrote: > On Thu, Jan 11, 2018 at 04:00:08PM -0200, Paulo Zanoni wrote: > > From: Anusha Srivatsa <anusha.srivatsa@xxxxxxxxx> > > > > ICP has two backlight controllers - similar to previous platforms like > > BXT. > > > > v2: Remove the usage of ICP_SECOND_PPS_BACKLIGHT register.(Jani) > > Reuse BXT code since it is very similar.(Ville) > > > > v3 (from Paulo): Rebase. > > > > Cc: Jani Nikula <jani.nikula@xxxxxxxxx> > > Cc: Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> > > Reviewed-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> > > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@xxxxxxxxx> > > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> > > --- > > drivers/gpu/drm/i915/intel_panel.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c > > index fa6831f8c004..ad80cca8c110 100644 > > --- a/drivers/gpu/drm/i915/intel_panel.c > > +++ b/drivers/gpu/drm/i915/intel_panel.c > > @@ -1865,7 +1865,7 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel) > > panel->backlight.set = bxt_set_backlight; > > panel->backlight.get = bxt_get_backlight; > > panel->backlight.hz_to_pwm = bxt_hz_to_pwm; > > - } else if (HAS_PCH_CNP(dev_priv)) { > > + } else if (HAS_PCH_CNP(dev_priv) || HAS_PCH_ICP(dev_priv)) { > > The commit message says reuse BXT, but the code says reuse CNP - which > one should it be? well, CNP is like BXT, but with only one controller. ICP is like BXT, including 2 controllers. I don't know if it makes more sense re-use the cnp or bxt functions But one way or another we have to address these lines from cnp_setup: /* * CNP has the BXT implementation of backlight, but with only * one controller. Future platforms could have multiple controll\ ers * so let's make this extensible and prepared for the future. */ panel->backlight.controller = 0; > > > panel->backlight.setup = cnp_setup_backlight; > > panel->backlight.enable = cnp_enable_backlight; > > panel->backlight.disable = cnp_disable_backlight; > > -- > > 2.14.3 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx