[Intel-gfx] [PATCH v2] drm/i915: use for_each_pipe loop to assign crtc_mask

[Jani Nikula]

On Fri, 07 Sep 2018, Ville Syrjälä <ville.syrjala at linux.intel.com> wrote:
> On Fri, Sep 07, 2018 at 04:04:03PM +0300, Jani Nikula wrote:
>> On Fri, 07 Sep 2018, Mahesh Kumar <mahesh1.kumar at intel.com> wrote:
>> > This cleanup patch makes changes to use for_each_pipe loop
>> > during bit-mask assignment of allowed crtc with encoder.
>> >
>> > changes:
>> >  - use BIT(i) macro instead of (1 << i) (Chris)
>> >
>> > Cc: Jani Nikula <jani.nikula at intel.com>
>> > Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
>> > Signed-off-by: Mahesh Kumar <mahesh1.kumar at intel.com>
>> > ---
>> >  drivers/gpu/drm/i915/intel_ddi.c  | 4 +++-
>> >  drivers/gpu/drm/i915/intel_dp.c   | 5 ++++-
>> >  drivers/gpu/drm/i915/intel_hdmi.c | 5 ++++-
>> >  3 files changed, 11 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
>> > index cd01a09c5e0f..88dfca245099 100644
>> > --- a/drivers/gpu/drm/i915/intel_ddi.c
>> > +++ b/drivers/gpu/drm/i915/intel_ddi.c
>> > @@ -3751,6 +3751,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
>> >  	struct intel_encoder *intel_encoder;
>> >  	struct drm_encoder *encoder;
>> >  	bool init_hdmi, init_dp, init_lspcon = false;
>> > +	u8 i;
>> 
>> Please use int instead of u8 throughout. u8 only makes sense when you
>> actually need the specific size, or need to be concerned about the size.
>
> Actually please use 'enum pipe pipe'.

D'oh, of course.

BR,
Jani.


>
>> 
>> BR,
>> Jani.
>> 
>> >  
>> >  
>> >  	init_hdmi = (dev_priv->vbt.ddi_port_info[port].supports_dvi ||
>> > @@ -3801,8 +3802,9 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
>> >  	intel_encoder->type = INTEL_OUTPUT_DDI;
>> >  	intel_encoder->power_domain = intel_port_to_power_domain(port);
>> >  	intel_encoder->port = port;
>> > -	intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
>> >  	intel_encoder->cloneable = 0;
>> > +	for_each_pipe(dev_priv, i)
>> > +		intel_encoder->crtc_mask |= BIT(i);
>> >  
>> >  	if (INTEL_GEN(dev_priv) >= 11)
>> >  		intel_dig_port->saved_port_bits = I915_READ(DDI_BUF_CTL(port)) &
>> > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>> > index 436c22de33b6..1f954debdc55 100644
>> > --- a/drivers/gpu/drm/i915/intel_dp.c
>> > +++ b/drivers/gpu/drm/i915/intel_dp.c
>> > @@ -6709,7 +6709,10 @@ bool intel_dp_init(struct drm_i915_private *dev_priv,
>> >  		else
>> >  			intel_encoder->crtc_mask = (1 << 0) | (1 << 1);
>> >  	} else {
>> > -		intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
>> > +		u8 i;
>> > +
>> > +		for_each_pipe(dev_priv, i)
>> > +			intel_encoder->crtc_mask |= BIT(i);
>> >  	}
>> >  	intel_encoder->cloneable = 0;
>> >  	intel_encoder->port = port;
>> > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
>> > index a2dab0b6bde6..647e38de7980 100644
>> > --- a/drivers/gpu/drm/i915/intel_hdmi.c
>> > +++ b/drivers/gpu/drm/i915/intel_hdmi.c
>> > @@ -2468,7 +2468,10 @@ void intel_hdmi_init(struct drm_i915_private *dev_priv,
>> >  		else
>> >  			intel_encoder->crtc_mask = (1 << 0) | (1 << 1);
>> >  	} else {
>> > -		intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
>> > +		u8 i;
>> > +
>> > +		for_each_pipe(dev_priv, i)
>> > +			intel_encoder->crtc_mask |= BIT(i);
>> >  	}
>> >  	intel_encoder->cloneable = 1 << INTEL_OUTPUT_ANALOG;
>> >  	/*
>> 
>> -- 
>> Jani Nikula, Intel Open Source Graphics Center
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Graphics Center