On Tue, Oct 27, 2020 at 10:06:53PM +0200, Ville Syrjälä wrote:
> On Tue, Oct 27, 2020 at 12:30:32PM -0700, 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@xxxxxxxxxxxxxxx>
> > Signed-off-by: Manasi Navare <manasi.d.navare@xxxxxxxxx>
> > ---
> > 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 | 35 +++++++++++---------
> > 3 files changed, 27 insertions(+), 20 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);
> > }
>
> Exhibit a
So for exhibit a : I need to change the callers :
intel_crtc_copy_uapi_to_hw_state_nomodeset
intel_crtc_copy_uapi_to_hw_state
intel_crtc_prepare_cleared_state
in a way where I pass state and crtc_state
So put all that in a patch 1
>
> >
> > /**
> > 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 ab00c99975f5..cabda5a02e9e 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -12661,7 +12661,7 @@ static bool encoders_cloneable(const struct intel_encoder *a,
> > b->cloneable & (1 << a->type));
> > }
> >
> > -static bool check_single_encoder_cloning(struct drm_atomic_state *state,
> > +static bool check_single_encoder_cloning(struct intel_atomic_state *state,
> > struct intel_crtc *crtc,
> > struct intel_encoder *encoder)
>
> Exhibit b
>
> Pretty much still looks like two independent patches squashed to one.
And passing intel_atomic_state in place of drm_atomic_state in Patch 2
?
>
> > {
> > @@ -12670,7 +12670,7 @@ static bool check_single_encoder_cloning(struct drm_atomic_state *state,
> > struct drm_connector_state *connector_state;
> > int i;
> >
> > - for_each_new_connector_in_state(state, connector, connector_state, i) {
> > + for_each_new_connector_in_state(&state->base, connector, connector_state, i) {
> > if (connector_state->crtc != &crtc->base)
> > continue;
> >
> > @@ -13446,13 +13446,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)
>
> Since we're going to the trouble of changing all the calling conventions
> I suspect we should just take this all the way and pass in state+crtc
> rather than state+crtc_state.
>
> See eg. commit 7451a074bf2f ("drm/i915: Change .crtc_enable/disable()
> calling convention")
>
Yes changing this as a follow up makes sense.
Just dont have the BW to change that now, need to also deliver VRR end of this week
So can this change be done as a follow up?
I will move exhibit a and b in 2 separate patches and call it good?
Manasi
> > {
> > - 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;
> > @@ -13460,7 +13464,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)
> > @@ -13483,7 +13487,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);
> > @@ -13515,16 +13520,16 @@ 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;
> > }
> >
> > static int
> > -intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)
> > +intel_modeset_pipe_config(struct intel_atomic_state *state,
> > + struct intel_crtc_state *pipe_config)
> > {
> > struct drm_crtc *crtc = pipe_config->uapi.crtc;
> > - struct drm_atomic_state *state = pipe_config->uapi.state;
> > struct drm_i915_private *i915 = to_i915(pipe_config->uapi.crtc->dev);
> > struct drm_connector *connector;
> > struct drm_connector_state *connector_state;
> > @@ -13566,7 +13571,7 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)
> > &pipe_config->pipe_src_w,
> > &pipe_config->pipe_src_h);
> >
> > - for_each_new_connector_in_state(state, connector, connector_state, i) {
> > + for_each_new_connector_in_state(&state->base, connector, connector_state, i) {
> > struct intel_encoder *encoder =
> > to_intel_encoder(connector_state->best_encoder);
> >
> > @@ -13604,7 +13609,7 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)
> > * adjust it according to limitations or connector properties, and also
> > * a chance to reject the mode entirely.
> > */
> > - for_each_new_connector_in_state(state, connector, connector_state, i) {
> > + for_each_new_connector_in_state(&state->base, connector, connector_state, i) {
> > struct intel_encoder *encoder =
> > to_intel_encoder(connector_state->best_encoder);
> >
> > @@ -15216,19 +15221,19 @@ 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;
> >
> > if (!new_crtc_state->hw.enable)
> > continue;
> >
> > - ret = intel_modeset_pipe_config(new_crtc_state);
> > + ret = intel_modeset_pipe_config(state, new_crtc_state);
> > if (ret)
> > goto fail;
> > }
> > --
> > 2.19.1
>
> --
> Ville Syrjälä
> Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
