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: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200417134720.16654-3-ville.syrjala@linux.intel.com Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Acked-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
parent
c38730987b
commit
7c2fedd760
|
@ -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);
|
||||
|
||||
intel_ddi_enable_transcoder_func(crtc_state);
|
||||
|
||||
intel_enable_pipe(crtc_state);
|
||||
|
||||
lpt_pch_enable(crtc_state);
|
||||
|
|
|
@ -3765,6 +3765,8 @@ static void intel_enable_ddi(struct intel_atomic_state *state,
|
|||
{
|
||||
WARN_ON(crtc_state->has_pch_encoder);
|
||||
|
||||
intel_ddi_enable_transcoder_func(crtc_state);
|
||||
|
||||
intel_enable_pipe(crtc_state);
|
||||
|
||||
intel_crtc_vblank_on(crtc_state);
|
||||
|
|
|
@ -7077,9 +7077,6 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
|
|||
if (INTEL_GEN(dev_priv) >= 11)
|
||||
icl_pipe_mbus_enable(crtc);
|
||||
|
||||
if (!transcoder_is_dsi(cpu_transcoder))
|
||||
intel_ddi_enable_transcoder_func(new_crtc_state);
|
||||
|
||||
intel_encoders_enable(state, crtc);
|
||||
|
||||
if (psl_clkgate_wa) {
|
||||
|
|
|
@ -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);
|
||||
|
||||
intel_ddi_enable_transcoder_func(pipe_config);
|
||||
|
||||
intel_enable_pipe(pipe_config);
|
||||
|
||||
intel_crtc_vblank_on(pipe_config);
|
||||
|
|
Loading…
Reference in New Issue