> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Ville
> Syrjala
> Sent: 21 March 2023 02:04
> To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> Subject: [PATCH 2/6] drm/i915/vrr: Eliminate redundant function
> arguments
>
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Some of the VRR functions take redundant arguments. Get rid of them to
> make life simpler.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_ddi.c | 2 +-
> drivers/gpu/drm/i915/display/intel_display.c | 2 +-
> drivers/gpu/drm/i915/display/intel_vrr.c | 10 ++++------
> drivers/gpu/drm/i915/display/intel_vrr.h | 9 ++-------
> 4 files changed, 8 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c
> b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 8d5b73594657..d094485f080d 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -2951,7 +2951,7 @@ static void intel_enable_ddi(struct
> intel_atomic_state *state,
>
> intel_enable_transcoder(crtc_state);
>
> - intel_vrr_enable(encoder, crtc_state);
> + intel_vrr_enable(crtc_state);
>
> intel_crtc_vblank_on(crtc_state);
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index 3356b0724e1e..5ee93824861b 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -3976,7 +3976,7 @@ static bool hsw_get_pipe_config(struct intel_crtc
> *crtc,
> intel_get_transcoder_timings(crtc, pipe_config);
>
> if (HAS_VRR(dev_priv) && !transcoder_is_dsi(pipe_config-
> >cpu_transcoder))
> - intel_vrr_get_config(crtc, pipe_config);
> + intel_vrr_get_config(pipe_config);
>
> intel_get_pipe_src_size(crtc, pipe_config);
>
> diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c
> b/drivers/gpu/drm/i915/display/intel_vrr.c
> index 4228f26b4c11..6d749de71058 100644
> --- a/drivers/gpu/drm/i915/display/intel_vrr.c
> +++ b/drivers/gpu/drm/i915/display/intel_vrr.c
> @@ -168,10 +168,9 @@ static u32 trans_vrr_ctl(const struct intel_crtc_state
> *crtc_state)
> VRR_CTL_PIPELINE_FULL_OVERRIDE;
> }
>
> -void intel_vrr_enable(struct intel_encoder *encoder,
> - const struct intel_crtc_state *crtc_state)
> +void intel_vrr_enable(const struct intel_crtc_state *crtc_state)
> {
> - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> + struct drm_i915_private *dev_priv =
> +to_i915(crtc_state->uapi.crtc->dev);
> enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
>
> if (!crtc_state->vrr.enable)
> @@ -230,10 +229,9 @@ void intel_vrr_disable(const struct intel_crtc_state
> *old_crtc_state)
> intel_de_write(dev_priv, TRANS_VRR_CTL(cpu_transcoder), 0); }
>
> -void intel_vrr_get_config(struct intel_crtc *crtc,
> - struct intel_crtc_state *crtc_state)
> +void intel_vrr_get_config(struct intel_crtc_state *crtc_state)
> {
> - struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> + struct drm_i915_private *dev_priv =
> +to_i915(crtc_state->uapi.crtc->dev);
> enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
> u32 trans_vrr_ctl;
>
> diff --git a/drivers/gpu/drm/i915/display/intel_vrr.h
> b/drivers/gpu/drm/i915/display/intel_vrr.h
> index 9fda1135b0dd..ee636a5367c8 100644
> --- a/drivers/gpu/drm/i915/display/intel_vrr.h
> +++ b/drivers/gpu/drm/i915/display/intel_vrr.h
> @@ -11,22 +11,17 @@
> struct drm_connector_state;
> struct intel_atomic_state;
> struct intel_connector;
> -struct intel_crtc;
> struct intel_crtc_state;
> -struct intel_dp;
> -struct intel_encoder;
>
> bool intel_vrr_is_capable(struct intel_connector *connector); void
> intel_vrr_check_modeset(struct intel_atomic_state *state); void
> intel_vrr_compute_config(struct intel_crtc_state *crtc_state,
> struct drm_connector_state *conn_state); -void
> intel_vrr_enable(struct intel_encoder *encoder,
> - const struct intel_crtc_state *crtc_state);
> +void intel_vrr_enable(const struct intel_crtc_state *crtc_state);
> void intel_vrr_send_push(const struct intel_crtc_state *crtc_state); bool
> intel_vrr_is_push_sent(const struct intel_crtc_state *crtc_state); void
> intel_vrr_disable(const struct intel_crtc_state *old_crtc_state); -void
> intel_vrr_get_config(struct intel_crtc *crtc,
> - struct intel_crtc_state *crtc_state);
> +void intel_vrr_get_config(struct intel_crtc_state *crtc_state);
> int intel_vrr_vmax_vblank_start(const struct intel_crtc_state *crtc_state); int
> intel_vrr_vmin_vblank_start(const struct intel_crtc_state *crtc_state);
>
> --
> 2.39.2
changes LGTM.
Thanks
Reviewed-by: Mitul Golani <mitulkumar.ajitkumar.golani@xxxxxxxxx>
