intel_ddi_enable_dp() and intel_ddi_enable_hdmi() both contain an identical sequence to enable the transcoder, wait for FEC status, and turn on vblank for each pipe. Move this into a new helper, intel_ddi_enable_transcoder_and_vblank(), to avoid the duplication.
No functional change. Signed-off-by: Ankit Nautiyal <[email protected]> --- drivers/gpu/drm/i915/display/intel_ddi.c | 43 ++++++++++++------------ 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 4f089df82ec8..5be4a7f00313 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -3368,6 +3368,25 @@ static void trans_port_sync_stop_link_train(struct intel_atomic_state *state, crtc_state); } +static void intel_ddi_enable_transcoder_and_vblank(struct intel_atomic_state *state, + struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state) +{ + struct intel_display *display = to_intel_display(encoder); + struct intel_crtc *pipe_crtc; + + intel_enable_transcoder(crtc_state); + + intel_ddi_wait_for_fec_status(encoder, crtc_state, true); + + for_each_pipe_crtc_modeset_enable(display, pipe_crtc, crtc_state) { + const struct intel_crtc_state *pipe_crtc_state = + intel_atomic_get_new_crtc_state(state, pipe_crtc); + + intel_crtc_vblank_on(pipe_crtc_state); + } +} + static void intel_ddi_enable_dp(struct intel_atomic_state *state, struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, @@ -3376,7 +3395,6 @@ static void intel_ddi_enable_dp(struct intel_atomic_state *state, struct intel_display *display = to_intel_display(encoder); struct intel_dp *intel_dp = enc_to_intel_dp(encoder); struct intel_digital_port *dig_port = enc_to_dig_port(encoder); - struct intel_crtc *pipe_crtc; enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; enum port port = encoder->port; @@ -3406,16 +3424,7 @@ static void intel_ddi_enable_dp(struct intel_atomic_state *state, drm_dp_dpcd_poll_act_handled(&intel_dp->aux, 0); } - intel_enable_transcoder(crtc_state); - - intel_ddi_wait_for_fec_status(encoder, crtc_state, true); - - for_each_pipe_crtc_modeset_enable(display, pipe_crtc, crtc_state) { - const struct intel_crtc_state *pipe_crtc_state = - intel_atomic_get_new_crtc_state(state, pipe_crtc); - - intel_crtc_vblank_on(pipe_crtc_state); - } + intel_ddi_enable_transcoder_and_vblank(state, encoder, crtc_state); if (port == PORT_A && DISPLAY_VER(display) < 9) intel_dp_stop_link_train(intel_dp, crtc_state); @@ -3458,7 +3467,6 @@ static void intel_ddi_enable_hdmi(struct intel_atomic_state *state, struct intel_display *display = to_intel_display(encoder); struct intel_digital_port *dig_port = enc_to_dig_port(encoder); struct drm_connector *connector = conn_state->connector; - struct intel_crtc *pipe_crtc; enum port port = encoder->port; u32 buf_ctl = 0; @@ -3466,16 +3474,7 @@ static void intel_ddi_enable_hdmi(struct intel_atomic_state *state, intel_vrr_transcoder_enable(crtc_state); - intel_enable_transcoder(crtc_state); - - intel_ddi_wait_for_fec_status(encoder, crtc_state, true); - - for_each_pipe_crtc_modeset_enable(display, pipe_crtc, crtc_state) { - const struct intel_crtc_state *pipe_crtc_state = - intel_atomic_get_new_crtc_state(state, pipe_crtc); - - intel_crtc_vblank_on(pipe_crtc_state); - } + intel_ddi_enable_transcoder_and_vblank(state, encoder, crtc_state); if (!intel_hdmi_handle_sink_scrambling(encoder, connector, crtc_state->hdmi_high_tmds_clock_ratio, -- 2.50.1
