Skip to content

Commit 8cd53c6

Browse files
committed
drm/i915: Simplify intel_ddi_compute_min_voltage_level()
Drop the redundant dev_priv parameters from intel_ddi_compute_min_voltage_level() to make life easier. Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Gustavo Sousa <[email protected]>
1 parent 0656afa commit 8cd53c6

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3696,9 +3696,10 @@ static int icl_ddi_min_voltage_level(const struct intel_crtc_state *crtc_state)
36963696
return 0;
36973697
}
36983698

3699-
void intel_ddi_compute_min_voltage_level(struct drm_i915_private *dev_priv,
3700-
struct intel_crtc_state *crtc_state)
3699+
void intel_ddi_compute_min_voltage_level(struct intel_crtc_state *crtc_state)
37013700
{
3701+
struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
3702+
37023703
if (DISPLAY_VER(dev_priv) >= 14)
37033704
crtc_state->min_voltage_level = icl_ddi_min_voltage_level(crtc_state);
37043705
else if (DISPLAY_VER(dev_priv) >= 12)
@@ -3920,7 +3921,7 @@ static void intel_ddi_get_config(struct intel_encoder *encoder,
39203921
pipe_config->lane_lat_optim_mask =
39213922
bxt_ddi_phy_get_lane_lat_optim_mask(encoder);
39223923

3923-
intel_ddi_compute_min_voltage_level(dev_priv, pipe_config);
3924+
intel_ddi_compute_min_voltage_level(pipe_config);
39243925

39253926
intel_hdmi_read_gcp_infoframe(encoder, pipe_config);
39263927

@@ -4200,7 +4201,7 @@ static int intel_ddi_compute_config(struct intel_encoder *encoder,
42004201
pipe_config->lane_lat_optim_mask =
42014202
bxt_ddi_phy_calc_lane_lat_optim_mask(pipe_config->lane_count);
42024203

4203-
intel_ddi_compute_min_voltage_level(dev_priv, pipe_config);
4204+
intel_ddi_compute_min_voltage_level(pipe_config);
42044205

42054206
return 0;
42064207
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ void intel_ddi_set_dp_msa(const struct intel_crtc_state *crtc_state,
7070
bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);
7171
void intel_ddi_set_vc_payload_alloc(const struct intel_crtc_state *crtc_state,
7272
bool state);
73-
void intel_ddi_compute_min_voltage_level(struct drm_i915_private *dev_priv,
74-
struct intel_crtc_state *crtc_state);
73+
void intel_ddi_compute_min_voltage_level(struct intel_crtc_state *crtc_state);
7574
int intel_ddi_toggle_hdcp_bits(struct intel_encoder *intel_encoder,
7675
enum transcoder cpu_transcoder,
7776
bool enable, u32 hdcp_mask);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,
614614

615615
intel_dp_audio_compute_config(encoder, pipe_config, conn_state);
616616

617-
intel_ddi_compute_min_voltage_level(dev_priv, pipe_config);
617+
intel_ddi_compute_min_voltage_level(pipe_config);
618618

619619
intel_psr_compute_config(intel_dp, pipe_config, conn_state);
620620

0 commit comments

Comments
 (0)