Quoting Ville Syrjala (2023-11-28 08:51:38-03:00) >From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > >Drop the redundant dev_priv parameters from >intel_ddi_compute_min_voltage_level() to make life easier. > >Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Reviewed-by: Gustavo Sousa <gustavo.sousa@xxxxxxxxx> >--- > drivers/gpu/drm/i915/display/intel_ddi.c | 9 +++++---- > drivers/gpu/drm/i915/display/intel_ddi.h | 3 +-- > drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- > 3 files changed, 7 insertions(+), 7 deletions(-) > >diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c >index dd04bd7b348c..12a29363e5df 100644 >--- a/drivers/gpu/drm/i915/display/intel_ddi.c >+++ b/drivers/gpu/drm/i915/display/intel_ddi.c >@@ -3696,9 +3696,10 @@ static int icl_ddi_min_voltage_level(const struct intel_crtc_state *crtc_state) > return 0; > } > >-void intel_ddi_compute_min_voltage_level(struct drm_i915_private *dev_priv, >- struct intel_crtc_state *crtc_state) >+void intel_ddi_compute_min_voltage_level(struct intel_crtc_state *crtc_state) > { >+ struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev); >+ > if (DISPLAY_VER(dev_priv) >= 14) > crtc_state->min_voltage_level = icl_ddi_min_voltage_level(crtc_state); > else if (DISPLAY_VER(dev_priv) >= 12) >@@ -3920,7 +3921,7 @@ static void intel_ddi_get_config(struct intel_encoder *encoder, > pipe_config->lane_lat_optim_mask = > bxt_ddi_phy_get_lane_lat_optim_mask(encoder); > >- intel_ddi_compute_min_voltage_level(dev_priv, pipe_config); >+ intel_ddi_compute_min_voltage_level(pipe_config); > > intel_hdmi_read_gcp_infoframe(encoder, pipe_config); > >@@ -4200,7 +4201,7 @@ static int intel_ddi_compute_config(struct intel_encoder *encoder, > pipe_config->lane_lat_optim_mask = > bxt_ddi_phy_calc_lane_lat_optim_mask(pipe_config->lane_count); > >- intel_ddi_compute_min_voltage_level(dev_priv, pipe_config); >+ intel_ddi_compute_min_voltage_level(pipe_config); > > return 0; > } >diff --git a/drivers/gpu/drm/i915/display/intel_ddi.h b/drivers/gpu/drm/i915/display/intel_ddi.h >index 63853a1f6582..434de7196875 100644 >--- a/drivers/gpu/drm/i915/display/intel_ddi.h >+++ b/drivers/gpu/drm/i915/display/intel_ddi.h >@@ -70,8 +70,7 @@ void intel_ddi_set_dp_msa(const struct intel_crtc_state *crtc_state, > bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector); > void intel_ddi_set_vc_payload_alloc(const struct intel_crtc_state *crtc_state, > bool state); >-void intel_ddi_compute_min_voltage_level(struct drm_i915_private *dev_priv, >- struct intel_crtc_state *crtc_state); >+void intel_ddi_compute_min_voltage_level(struct intel_crtc_state *crtc_state); > int intel_ddi_toggle_hdcp_bits(struct intel_encoder *intel_encoder, > enum transcoder cpu_transcoder, > bool enable, u32 hdcp_mask); >diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c >index 63364c9602ef..060728a4b851 100644 >--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c >+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c >@@ -614,7 +614,7 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, > > intel_dp_audio_compute_config(encoder, pipe_config, conn_state); > >- intel_ddi_compute_min_voltage_level(dev_priv, pipe_config); >+ intel_ddi_compute_min_voltage_level(pipe_config); > > intel_psr_compute_config(intel_dp, pipe_config, conn_state); > >-- >2.41.0 >