Skip to content

Commit

Permalink
drm/i915: Push TRANS_DDI_FUNC_CTL into the encoder->enable() hook
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ville Syrjälä committed Apr 20, 2020
1 parent c387309 commit 7c2fedd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/display/intel_crt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/display/intel_ddi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 0 additions & 3 deletions drivers/gpu/drm/i915/display/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/display/intel_dp_mst.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 7c2fedd

Please sign in to comment.