Commit 55a4679e authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Rename intel_ddi_{enable,disable}_pipe_clock()

What intel_ddi_{enable,disable}_pipe_clock() actually do is
enable the clock to the transcoder, not the pipe. Rename
accordingly.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230213225258.2127-2-ville.syrjala@linux.intel.comReviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 01a789fa
...@@ -260,7 +260,7 @@ static void hsw_post_disable_crt(struct intel_atomic_state *state, ...@@ -260,7 +260,7 @@ static void hsw_post_disable_crt(struct intel_atomic_state *state,
ilk_pfit_disable(old_crtc_state); ilk_pfit_disable(old_crtc_state);
intel_ddi_disable_pipe_clock(old_crtc_state); intel_ddi_disable_transcoder_clock(old_crtc_state);
pch_post_disable_crt(state, encoder, old_crtc_state, old_conn_state); pch_post_disable_crt(state, encoder, old_crtc_state, old_conn_state);
...@@ -300,7 +300,7 @@ static void hsw_pre_enable_crt(struct intel_atomic_state *state, ...@@ -300,7 +300,7 @@ static void hsw_pre_enable_crt(struct intel_atomic_state *state,
hsw_fdi_link_train(encoder, crtc_state); hsw_fdi_link_train(encoder, crtc_state);
intel_ddi_enable_pipe_clock(encoder, crtc_state); intel_ddi_enable_transcoder_clock(encoder, crtc_state);
} }
static void hsw_enable_crt(struct intel_atomic_state *state, static void hsw_enable_crt(struct intel_atomic_state *state,
......
...@@ -944,8 +944,8 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder, ...@@ -944,8 +944,8 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder,
main_link_aux_power_domain_get(dig_port, crtc_state); main_link_aux_power_domain_get(dig_port, crtc_state);
} }
void intel_ddi_enable_pipe_clock(struct intel_encoder *encoder, void intel_ddi_enable_transcoder_clock(struct intel_encoder *encoder,
const struct intel_crtc_state *crtc_state) const struct intel_crtc_state *crtc_state)
{ {
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
...@@ -965,7 +965,7 @@ void intel_ddi_enable_pipe_clock(struct intel_encoder *encoder, ...@@ -965,7 +965,7 @@ void intel_ddi_enable_pipe_clock(struct intel_encoder *encoder,
} }
} }
void intel_ddi_disable_pipe_clock(const struct intel_crtc_state *crtc_state) void intel_ddi_disable_transcoder_clock(const struct intel_crtc_state *crtc_state)
{ {
struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev); struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
...@@ -2379,7 +2379,7 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state, ...@@ -2379,7 +2379,7 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state,
* 7.a Configure Transcoder Clock Select to direct the Port clock to the * 7.a Configure Transcoder Clock Select to direct the Port clock to the
* Transcoder. * Transcoder.
*/ */
intel_ddi_enable_pipe_clock(encoder, crtc_state); intel_ddi_enable_transcoder_clock(encoder, crtc_state);
if (HAS_DP20(dev_priv)) if (HAS_DP20(dev_priv))
intel_ddi_config_transcoder_dp2(encoder, crtc_state); intel_ddi_config_transcoder_dp2(encoder, crtc_state);
...@@ -2506,7 +2506,7 @@ static void hsw_ddi_pre_enable_dp(struct intel_atomic_state *state, ...@@ -2506,7 +2506,7 @@ static void hsw_ddi_pre_enable_dp(struct intel_atomic_state *state,
intel_ddi_enable_fec(encoder, crtc_state); intel_ddi_enable_fec(encoder, crtc_state);
if (!is_mst) if (!is_mst)
intel_ddi_enable_pipe_clock(encoder, crtc_state); intel_ddi_enable_transcoder_clock(encoder, crtc_state);
intel_dsc_dp_pps_write(encoder, crtc_state); intel_dsc_dp_pps_write(encoder, crtc_state);
} }
...@@ -2548,7 +2548,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_atomic_state *state, ...@@ -2548,7 +2548,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_atomic_state *state,
icl_program_mg_dp_mode(dig_port, crtc_state); icl_program_mg_dp_mode(dig_port, crtc_state);
intel_ddi_enable_pipe_clock(encoder, crtc_state); intel_ddi_enable_transcoder_clock(encoder, crtc_state);
dig_port->set_infoframes(encoder, dig_port->set_infoframes(encoder,
crtc_state->has_infoframe, crtc_state->has_infoframe,
...@@ -2657,7 +2657,7 @@ static void intel_ddi_post_disable_dp(struct intel_atomic_state *state, ...@@ -2657,7 +2657,7 @@ static void intel_ddi_post_disable_dp(struct intel_atomic_state *state,
} }
} else { } else {
if (!is_mst) if (!is_mst)
intel_ddi_disable_pipe_clock(old_crtc_state); intel_ddi_disable_transcoder_clock(old_crtc_state);
} }
intel_disable_ddi_buf(encoder, old_crtc_state); intel_disable_ddi_buf(encoder, old_crtc_state);
...@@ -2668,7 +2668,7 @@ static void intel_ddi_post_disable_dp(struct intel_atomic_state *state, ...@@ -2668,7 +2668,7 @@ static void intel_ddi_post_disable_dp(struct intel_atomic_state *state,
* transcoder" * transcoder"
*/ */
if (DISPLAY_VER(dev_priv) >= 12) if (DISPLAY_VER(dev_priv) >= 12)
intel_ddi_disable_pipe_clock(old_crtc_state); intel_ddi_disable_transcoder_clock(old_crtc_state);
intel_pps_vdd_on(intel_dp); intel_pps_vdd_on(intel_dp);
intel_pps_off(intel_dp); intel_pps_off(intel_dp);
...@@ -2694,12 +2694,12 @@ static void intel_ddi_post_disable_hdmi(struct intel_atomic_state *state, ...@@ -2694,12 +2694,12 @@ static void intel_ddi_post_disable_hdmi(struct intel_atomic_state *state,
old_crtc_state, old_conn_state); old_crtc_state, old_conn_state);
if (DISPLAY_VER(dev_priv) < 12) if (DISPLAY_VER(dev_priv) < 12)
intel_ddi_disable_pipe_clock(old_crtc_state); intel_ddi_disable_transcoder_clock(old_crtc_state);
intel_disable_ddi_buf(encoder, old_crtc_state); intel_disable_ddi_buf(encoder, old_crtc_state);
if (DISPLAY_VER(dev_priv) >= 12) if (DISPLAY_VER(dev_priv) >= 12)
intel_ddi_disable_pipe_clock(old_crtc_state); intel_ddi_disable_transcoder_clock(old_crtc_state);
intel_display_power_put(dev_priv, intel_display_power_put(dev_priv,
dig_port->ddi_io_power_domain, dig_port->ddi_io_power_domain,
......
...@@ -52,9 +52,9 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe); ...@@ -52,9 +52,9 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe);
void intel_ddi_enable_transcoder_func(struct intel_encoder *encoder, void intel_ddi_enable_transcoder_func(struct intel_encoder *encoder,
const struct intel_crtc_state *crtc_state); const struct intel_crtc_state *crtc_state);
void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state); void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state);
void intel_ddi_enable_pipe_clock(struct intel_encoder *encoder, void intel_ddi_enable_transcoder_clock(struct intel_encoder *encoder,
const struct intel_crtc_state *crtc_state); const struct intel_crtc_state *crtc_state);
void intel_ddi_disable_pipe_clock(const struct intel_crtc_state *crtc_state); void intel_ddi_disable_transcoder_clock(const struct intel_crtc_state *crtc_state);
void intel_ddi_set_dp_msa(const struct intel_crtc_state *crtc_state, void intel_ddi_set_dp_msa(const struct intel_crtc_state *crtc_state,
const struct drm_connector_state *conn_state); const struct drm_connector_state *conn_state);
bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector); bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);
......
...@@ -598,7 +598,7 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state, ...@@ -598,7 +598,7 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,
* no clock to the transcoder" * no clock to the transcoder"
*/ */
if (DISPLAY_VER(dev_priv) < 12 || !last_mst_stream) if (DISPLAY_VER(dev_priv) < 12 || !last_mst_stream)
intel_ddi_disable_pipe_clock(old_crtc_state); intel_ddi_disable_transcoder_clock(old_crtc_state);
intel_mst->connector = NULL; intel_mst->connector = NULL;
...@@ -678,7 +678,7 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state, ...@@ -678,7 +678,7 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state,
* here for the following ones. * here for the following ones.
*/ */
if (DISPLAY_VER(dev_priv) < 12 || !first_mst_stream) if (DISPLAY_VER(dev_priv) < 12 || !first_mst_stream)
intel_ddi_enable_pipe_clock(encoder, pipe_config); intel_ddi_enable_transcoder_clock(encoder, pipe_config);
intel_ddi_set_dp_msa(pipe_config, conn_state); intel_ddi_set_dp_msa(pipe_config, conn_state);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment