| Message ID | 20201102211906.4893-4-manasi.d.navare@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v5,1/6] drm/i915/dp: Some reshuffling in mode_valid as prep for bigjoiner modes | expand |
On Mon, Nov 02, 2020 at 01:19:04PM -0800, Manasi Navare wrote: > No functional changes, to align with previous cleanups pass > intel_atomic_state instead of drm_atomic_state. > Also pass this intel_atomic_state with crtc_state to > some of the atomic_check functions. > > Signed-off-by: Manasi Navare <manasi.d.navare@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index e8cdfab69c91..0bea90cdf242 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -12671,7 +12671,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) > { > @@ -12680,7 +12680,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; > > @@ -13534,10 +13534,10 @@ intel_crtc_prepare_cleared_state(struct intel_crtc_state *crtc_state) > } > > 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; > @@ -13579,7 +13579,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); > > @@ -13617,7 +13617,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); > > @@ -15245,7 +15245,7 @@ static int intel_atomic_check(struct drm_device *dev, > 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 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index e8cdfab69c91..0bea90cdf242 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -12671,7 +12671,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) { @@ -12680,7 +12680,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; @@ -13534,10 +13534,10 @@ intel_crtc_prepare_cleared_state(struct intel_crtc_state *crtc_state) } 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; @@ -13579,7 +13579,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); @@ -13617,7 +13617,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); @@ -15245,7 +15245,7 @@ static int intel_atomic_check(struct drm_device *dev, 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; }
No functional changes, to align with previous cleanups pass intel_atomic_state instead of drm_atomic_state. Also pass this intel_atomic_state with crtc_state to some of the atomic_check functions. Signed-off-by: Manasi Navare <manasi.d.navare@intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)