Commit b25e0741 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915/vrr: Eliminate redundant function arguments 



Some of the VRR functions take redundant arguments. Get rid
of them to make life simpler.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230320203352.19515-3-ville.syrjala@linux.intel.com


Reviewed-by: default avatarMitul Golani <mitulkumar.ajitkumar.golani@intel.com>
parent 6a985607

drivers/gpu/drm/i915/display/intel_ddi.c

+1 −1
Original line number Diff line number Diff line
@@ -2963,7 +2963,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);

drivers/gpu/drm/i915/display/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -3909,7 +3909,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);

drivers/gpu/drm/i915/display/intel_vrr.c

+4 −6
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/display/intel_vrr.h

+2 −7
Original line number Diff line number Diff line
@@ -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);