[Intel-gfx] [PATCH v5 5/6] drm/i915/dp: Prep for bigjoiner atomic check

Thu Nov 5 16:09:38 UTC 2020

On Thu, Nov 05, 2020 at 05:23:33PM +0200, Ville Syrjälä wrote:
> On Thu, Nov 05, 2020 at 05:21:31PM +0200, Ville Syrjälä wrote:
> > On Mon, Nov 02, 2020 at 01:19:05PM -0800, Manasi Navare wrote:
> > > No functional changes here. Just pass intel_atomic_state
> > > along with crtc_state to certain atomic_check functions.
> > > This will lay the foundation for adding bigjoiner master/slave
> > > states in atomic check.
> > > 
> > > v2:
> > > * More prep with intel_atomic_state (Ville)
> > > 
> > > Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > > Signed-off-by: Manasi Navare <manasi.d.navare at intel.com>
> > > ---
> > >  drivers/gpu/drm/i915/display/intel_atomic.c  |  9 +++++----
> > >  drivers/gpu/drm/i915/display/intel_atomic.h  |  3 ++-
> > >  drivers/gpu/drm/i915/display/intel_display.c | 21 ++++++++++++--------
> > >  3 files changed, 20 insertions(+), 13 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
> > > index 86be032bcf96..e243ce97b534 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_atomic.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_atomic.c
> > > @@ -270,14 +270,15 @@ void intel_crtc_free_hw_state(struct intel_crtc_state *crtc_state)
> > >  	intel_crtc_put_color_blobs(crtc_state);
> > >  }
> > >  
> > > -void intel_crtc_copy_color_blobs(struct intel_crtc_state *crtc_state)
> > > +void intel_crtc_copy_color_blobs(struct intel_crtc_state *crtc_state,
> > > +				 const struct intel_crtc_state *from_crtc_state)
> > >  {
> > >  	drm_property_replace_blob(&crtc_state->hw.degamma_lut,
> > > -				  crtc_state->uapi.degamma_lut);
> > > +				  from_crtc_state->uapi.degamma_lut);
> > >  	drm_property_replace_blob(&crtc_state->hw.gamma_lut,
> > > -				  crtc_state->uapi.gamma_lut);
> > > +				  from_crtc_state->uapi.gamma_lut);
> > >  	drm_property_replace_blob(&crtc_state->hw.ctm,
> > > -				  crtc_state->uapi.ctm);
> > > +				  from_crtc_state->uapi.ctm);
> > 
> > This patch still seems to do two totally separate things:
> > 1) pass intel_atomic_State all over (for which there was another
> >    patch in the series as well?)
> 
> Looks like it was patch 4. So I would just squash all those changes from
> here into patch 4.

Okay so all the changes where I am sending the intel_atomic_state to functions
move those to Patch 4 and then just keep the
color blobs change here?

Manasi

> 
> > 2) this intel_crtc_copy_color_blobs() change
> > 
> > I would split these up because the commit message doesn't
> > even mention the second change.
> > 
> > Each part looks fine on its own so with a proper split they are
> > Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > 
> > >  }
> > >  
> > >  /**
> > > diff --git a/drivers/gpu/drm/i915/display/intel_atomic.h b/drivers/gpu/drm/i915/display/intel_atomic.h
> > > index 285de07011dc..62a3365ed5e6 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_atomic.h
> > > +++ b/drivers/gpu/drm/i915/display/intel_atomic.h
> > > @@ -43,7 +43,8 @@ struct drm_crtc_state *intel_crtc_duplicate_state(struct drm_crtc *crtc);
> > >  void intel_crtc_destroy_state(struct drm_crtc *crtc,
> > >  			       struct drm_crtc_state *state);
> > >  void intel_crtc_free_hw_state(struct intel_crtc_state *crtc_state);
> > > -void intel_crtc_copy_color_blobs(struct intel_crtc_state *crtc_state);
> > > +void intel_crtc_copy_color_blobs(struct intel_crtc_state *crtc_state,
> > > +				 const struct intel_crtc_state *from_crtc_state);
> > >  struct drm_atomic_state *intel_atomic_state_alloc(struct drm_device *dev);
> > >  void intel_atomic_state_free(struct drm_atomic_state *state);
> > >  void intel_atomic_state_clear(struct drm_atomic_state *state);
> > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> > > index 0bea90cdf242..ab10dfe705e4 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > > @@ -13459,13 +13459,17 @@ static bool check_digital_port_conflicts(struct intel_atomic_state *state)
> > >  }
> > >  
> > >  static void
> > > -intel_crtc_copy_uapi_to_hw_state_nomodeset(struct intel_crtc_state *crtc_state)
> > > +intel_crtc_copy_uapi_to_hw_state_nomodeset(struct intel_atomic_state *state,
> > > +					   struct intel_crtc_state *crtc_state)
> > >  {
> > > -	intel_crtc_copy_color_blobs(crtc_state);
> > > +	const struct intel_crtc_state *from_crtc_state = crtc_state;
> > > +
> > > +	intel_crtc_copy_color_blobs(crtc_state, from_crtc_state);
> > >  }
> > >  
> > >  static void
> > > -intel_crtc_copy_uapi_to_hw_state(struct intel_crtc_state *crtc_state)
> > > +intel_crtc_copy_uapi_to_hw_state(struct intel_atomic_state *state,
> > > +				 struct intel_crtc_state *crtc_state)
> > >  {
> > >  	crtc_state->hw.enable = crtc_state->uapi.enable;
> > >  	crtc_state->hw.active = crtc_state->uapi.active;
> > > @@ -13473,7 +13477,7 @@ intel_crtc_copy_uapi_to_hw_state(struct intel_crtc_state *crtc_state)
> > >  	crtc_state->hw.pipe_mode = crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode;
> > >  	crtc_state->hw.scaling_filter = crtc_state->uapi.scaling_filter;
> > >  
> > > -	intel_crtc_copy_uapi_to_hw_state_nomodeset(crtc_state);
> > > +	intel_crtc_copy_uapi_to_hw_state_nomodeset(state, crtc_state);
> > >  }
> > >  
> > >  static void intel_crtc_copy_hw_to_uapi_state(struct intel_crtc_state *crtc_state)
> > > @@ -13496,7 +13500,8 @@ static void intel_crtc_copy_hw_to_uapi_state(struct intel_crtc_state *crtc_state
> > >  }
> > >  
> > >  static int
> > > -intel_crtc_prepare_cleared_state(struct intel_crtc_state *crtc_state)
> > > +intel_crtc_prepare_cleared_state(struct intel_atomic_state *state,
> > > +				 struct intel_crtc_state *crtc_state)
> > >  {
> > >  	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> > >  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> > > @@ -13528,7 +13533,7 @@ intel_crtc_prepare_cleared_state(struct intel_crtc_state *crtc_state)
> > >  	memcpy(crtc_state, saved_state, sizeof(*crtc_state));
> > >  	kfree(saved_state);
> > >  
> > > -	intel_crtc_copy_uapi_to_hw_state(crtc_state);
> > > +	intel_crtc_copy_uapi_to_hw_state(state, crtc_state);
> > >  
> > >  	return 0;
> > >  }
> > > @@ -15233,12 +15238,12 @@ static int intel_atomic_check(struct drm_device *dev,
> > >  					    new_crtc_state, i) {
> > >  		if (!needs_modeset(new_crtc_state)) {
> > >  			/* Light copy */
> > > -			intel_crtc_copy_uapi_to_hw_state_nomodeset(new_crtc_state);
> > > +			intel_crtc_copy_uapi_to_hw_state_nomodeset(state, new_crtc_state);
> > >  
> > >  			continue;
> > >  		}
> > >  
> > > -		ret = intel_crtc_prepare_cleared_state(new_crtc_state);
> > > +		ret = intel_crtc_prepare_cleared_state(state, new_crtc_state);
> > >  		if (ret)
> > >  			goto fail;
> > >  
> > > -- 
> > > 2.19.1
> > 
> > -- 
> > Ville Syrjälä
> > Intel
> 
> -- 
> Ville Syrjälä
> Intel