[Intel-gfx] [PATCH 2/4] drm/i915/lspcon: Add dp_to_lspcon helper()

[Imre Deak]

On ti, 2016-11-22 at 15:49 +0530, Sharma, Shashank wrote:
> Regards
> 
> Shashank
> 
> 
> On 11/22/2016 12:45 AM, Imre Deak wrote:
> > We need to get to LSPCON in the next patch, so factor out the helper for
> > it. While at it also remove the redundant GEN9 check.
> > 
> > Cc: Shashank Sharma <shashank.sharma at intel.com>
> > Signed-off-by: Imre Deak <imre.deak at intel.com>
> > ---
> >   drivers/gpu/drm/i915/intel_dp.c  | 7 +++----
> >   drivers/gpu/drm/i915/intel_drv.h | 6 ++++++
> >   2 files changed, 9 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> > index 90283ed..16c19d78 100644
> > --- a/drivers/gpu/drm/i915/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/intel_dp.c
> > @@ -4753,14 +4753,13 @@ static void intel_edp_panel_vdd_sanitize(struct intel_dp *intel_dp)
> >   void intel_dp_encoder_reset(struct drm_encoder *encoder)
> >   {
> >   	struct drm_i915_private *dev_priv = to_i915(encoder->dev);
> > -	struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
> > -	struct intel_lspcon *lspcon = &intel_dig_port->lspcon;
> > -	struct intel_dp *intel_dp = &intel_dig_port->dp;
> > +	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
> > +	struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp);
> >   
> >   	if (!HAS_DDI(dev_priv))
> >   		intel_dp->DP = I915_READ(intel_dp->output_reg);
> >   
> > -	if (IS_GEN9(dev_priv) && lspcon->active)
> > +	if (lspcon->active)
> Shouldn't this be part of next patch itself ? Any reason why we have a 
> separate patch for this ?

Having separate patches for cleanups without side effects makes the
review and bisection easier.

> Apart from this,
> Reviewed-by: Shashank Sharma <shashank.sharma at intel.com>
> 
> Regards
> Shashank
> >   		lspcon_resume(lspcon);
> >   
> >   	if (to_intel_encoder(encoder)->type != INTEL_OUTPUT_EDP)
> > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> > index cd132c2..cf47e8a 100644
> > --- a/drivers/gpu/drm/i915/intel_drv.h
> > +++ b/drivers/gpu/drm/i915/intel_drv.h
> > @@ -1089,6 +1089,12 @@ dp_to_dig_port(struct intel_dp *intel_dp)
> >   	return container_of(intel_dp, struct intel_digital_port, dp);
> >   }
> >   
> > +static inline struct intel_lspcon *
> > +dp_to_lspcon(struct intel_dp *intel_dp)
> > +{
> > +	return &dp_to_dig_port(intel_dp)->lspcon;
> > +}
> > +
> >   static inline struct intel_digital_port *
> >   hdmi_to_dig_port(struct intel_hdmi *intel_hdmi)
> >   {
>