Re: [PATCH v3 06/25] drm/i915: Add helper to modeset a set of pipes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Sep 15, 2023 at 09:34:26PM +0300, Ville Syrjälä wrote:
> On Thu, Sep 14, 2023 at 10:26:40PM +0300, Imre Deak wrote:
> > Add intel_modeset_pipes_in_mask_early() to modeset a provided set of
> > pipes, used in a follow-up patch.
> > 
> > While at it add _late suffix to intel_modeset_all_pipes() for clarity
> > and add DocBook descriptions for the two exported functions.
> > 
> > v2:
> > - Add a flag controlling if active planes are force updated as well.
> > - Add DockBook descriptions.
> > v3:
> > - For clarity use _early/_late suffixes for the exported functions
> >   instead of the update_active_planes parameter. (Ville)
> > 
> > Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> > Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
> > ---
> >  drivers/gpu/drm/i915/display/intel_cdclk.c   |  2 +-
> >  drivers/gpu/drm/i915/display/intel_display.c | 45 ++++++++++++++++++--
> >  drivers/gpu/drm/i915/display/intel_display.h |  6 ++-
> >  drivers/gpu/drm/i915/display/skl_watermark.c |  2 +-
> >  4 files changed, 47 insertions(+), 8 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> > index ad5251ba6fe13..a2e20b25d6361 100644
> > --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> > +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> > @@ -3139,7 +3139,7 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state)
> >  	} else if (intel_cdclk_needs_modeset(&old_cdclk_state->actual,
> >  					     &new_cdclk_state->actual)) {
> >  		/* All pipes must be switched off while we change the cdclk. */
> > -		ret = intel_modeset_all_pipes(state, "CDCLK change");
> > +		ret = intel_modeset_all_pipes_late(state, "CDCLK change");
> >  		if (ret)
> >  			return ret;
> >  
> > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> > index 6bbc9069754c4..27e6ea21e0a91 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -5407,8 +5407,9 @@ intel_verify_planes(struct intel_atomic_state *state)
> >  			     plane_state->uapi.visible);
> >  }
> >  
> > -int intel_modeset_all_pipes(struct intel_atomic_state *state,
> > -			    const char *reason)
> > +static int intel_modeset_pipes_in_mask(struct intel_atomic_state *state,
> > +				       const char *reason, u8 mask,
> > +				       bool update_active_planes)
> >  {
> >  	struct drm_i915_private *dev_priv = to_i915(state->base.dev);
> >  	struct intel_crtc *crtc;
> > @@ -5417,7 +5418,7 @@ int intel_modeset_all_pipes(struct intel_atomic_state *state,
> >  	 * Add all pipes to the state, and force
> >  	 * a modeset on all the active ones.
> >  	 */
> > -	for_each_intel_crtc(&dev_priv->drm, crtc) {
> > +	for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, crtc, mask) {
> >  		struct intel_crtc_state *crtc_state;
> >  		int ret;
> >  
> > @@ -5448,7 +5449,9 @@ int intel_modeset_all_pipes(struct intel_atomic_state *state,
> >  		if (ret)
> >  			return ret;
> >  
> > -		crtc_state->update_planes |= crtc_state->active_planes;
> > +		if (update_active_planes)
> > +			crtc_state->update_planes |= crtc_state->active_planes;
> 
> This thing still confuses me. We have a bunch of other "late modeset"
> stuff in there (async flip handling and clearing of fastset flag at
> least). I still think a clean split would be better than a confusing
> parameter.

Ok, makes sense. The rest of the flags start out as cleared, but the
only relevant thing for early modeset is setting uapi.mode_changed
(IIUC).

Also, adding hw.enable && !hw.active CRTCs to the state could be
done only during an early modeset.

> > +
> >  		crtc_state->async_flip_planes = 0;
> >  		crtc_state->do_async_flip = false;
> >  	}
> > @@ -5456,6 +5459,40 @@ int intel_modeset_all_pipes(struct intel_atomic_state *state,
> >  	return 0;
> >  }
> >  
> > +/**
> > + * intel_modeset_pipes_in_mask_early - force a full modeset on a set of pipes
> > + * @state: intel atomic state
> > + * @reason: the reason for the full modeset
> > + * @mask: mask of pipes to modeset
> > + *
> > + * Force a full modeset on pipes in @mask due to the description in @reason.
> > + * This function can be called only before new plane states are computed.
> > + *
> > + * Returns 0 in case of success, negative error code otherwise.
> > + */
> > +int intel_modeset_pipes_in_mask_early(struct intel_atomic_state *state,
> > +				      const char *reason, u8 mask)
> > +{
> > +	return intel_modeset_pipes_in_mask(state, reason, mask, false);
> > +}
> > +
> > +/**
> > + * intel_modeset_all_pipes_late - force a full modeset on all pipes
> > + * @state: intel atomic state
> > + * @reason: the reason for the full modeset
> > + *
> > + * Force a full modeset on all pipes due to the description in @reason.
> > + * This function can be called only after new plane states are computed
> > + * already.
> > + *
> > + * Returns 0 in case of success, negative error code otherwise.
> > + */
> > +int intel_modeset_all_pipes_late(struct intel_atomic_state *state,
> > +				 const char *reason)
> > +{
> > +	return intel_modeset_pipes_in_mask(state, reason, -1, true);
> > +}
> > +
> >  /*
> >   * This implements the workaround described in the "notes" section of the mode
> >   * set sequence documentation. When going from no pipes or single pipe to
> > diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> > index 49ac8473b988b..64a5be7859331 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.h
> > +++ b/drivers/gpu/drm/i915/display/intel_display.h
> > @@ -513,8 +513,10 @@ void intel_plane_fixup_bitmasks(struct intel_crtc_state *crtc_state);
> >  void intel_update_watermarks(struct drm_i915_private *i915);
> >  
> >  /* modesetting */
> > -int intel_modeset_all_pipes(struct intel_atomic_state *state,
> > -			    const char *reason);
> > +int intel_modeset_pipes_in_mask_early(struct intel_atomic_state *state,
> > +				      const char *reason, u8 pipe_mask);
> > +int intel_modeset_all_pipes_late(struct intel_atomic_state *state,
> > +				 const char *reason);
> >  void intel_modeset_get_crtc_power_domains(struct intel_crtc_state *crtc_state,
> >  					  struct intel_power_domain_mask *old_domains);
> >  void intel_modeset_put_crtc_power_domains(struct intel_crtc *crtc,
> > diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
> > index 063929a42a42f..a29d9b717deed 100644
> > --- a/drivers/gpu/drm/i915/display/skl_watermark.c
> > +++ b/drivers/gpu/drm/i915/display/skl_watermark.c
> > @@ -2616,7 +2616,7 @@ skl_compute_ddb(struct intel_atomic_state *state)
> >  
> >  		if (old_dbuf_state->joined_mbus != new_dbuf_state->joined_mbus) {
> >  			/* TODO: Implement vblank synchronized MBUS joining changes */
> > -			ret = intel_modeset_all_pipes(state, "MBUS joining change");
> > +			ret = intel_modeset_all_pipes_late(state, "MBUS joining change");
> >  			if (ret)
> >  				return ret;
> >  		}
> > -- 
> > 2.37.2
> 
> -- 
> Ville Syrjälä
> Intel



[Index of Archives]     [AMD Graphics]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux