Commit 7c2fedd7 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Push TRANS_DDI_FUNC_CTL into the encoder->enable() hook

Push the TRANS_DDI_FUNC_CTL into the encoder enable hook. The disable
is already there, and as a followup will enable us to pass the encoder
all the way down.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200417134720.16654-3-ville.syrjala@linux.intel.comReviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
parent c3873098
...@@ -308,6 +308,8 @@ static void hsw_enable_crt(struct intel_atomic_state *state, ...@@ -308,6 +308,8 @@ static void hsw_enable_crt(struct intel_atomic_state *state,
drm_WARN_ON(&dev_priv->drm, !crtc_state->has_pch_encoder); drm_WARN_ON(&dev_priv->drm, !crtc_state->has_pch_encoder);
intel_ddi_enable_transcoder_func(crtc_state);
intel_enable_pipe(crtc_state); intel_enable_pipe(crtc_state);
lpt_pch_enable(crtc_state); lpt_pch_enable(crtc_state);
......
...@@ -3765,6 +3765,8 @@ static void intel_enable_ddi(struct intel_atomic_state *state, ...@@ -3765,6 +3765,8 @@ static void intel_enable_ddi(struct intel_atomic_state *state,
{ {
WARN_ON(crtc_state->has_pch_encoder); WARN_ON(crtc_state->has_pch_encoder);
intel_ddi_enable_transcoder_func(crtc_state);
intel_enable_pipe(crtc_state); intel_enable_pipe(crtc_state);
intel_crtc_vblank_on(crtc_state); intel_crtc_vblank_on(crtc_state);
......
...@@ -7077,9 +7077,6 @@ static void hsw_crtc_enable(struct intel_atomic_state *state, ...@@ -7077,9 +7077,6 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
if (INTEL_GEN(dev_priv) >= 11) if (INTEL_GEN(dev_priv) >= 11)
icl_pipe_mbus_enable(crtc); icl_pipe_mbus_enable(crtc);
if (!transcoder_is_dsi(cpu_transcoder))
intel_ddi_enable_transcoder_func(new_crtc_state);
intel_encoders_enable(state, crtc); intel_encoders_enable(state, crtc);
if (psl_clkgate_wa) { if (psl_clkgate_wa) {
......
...@@ -510,6 +510,8 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state, ...@@ -510,6 +510,8 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state,
drm_WARN_ON(&dev_priv->drm, pipe_config->has_pch_encoder); drm_WARN_ON(&dev_priv->drm, pipe_config->has_pch_encoder);
intel_ddi_enable_transcoder_func(pipe_config);
intel_enable_pipe(pipe_config); intel_enable_pipe(pipe_config);
intel_crtc_vblank_on(pipe_config); intel_crtc_vblank_on(pipe_config);
......
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