diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2017-10-05 12:52:13 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2017-10-06 10:30:44 +0200 |
| commit | 27d81c28eef1d44ddb95980e681d28807e9bce54 (patch) | |
| tree | 96fafe82a83d1a02c0af6fc1b65232df87ca62f1 | |
| parent | drm/i915: push DDI and DSI underrun reporting on enable to encoder (diff) | |
| download | linux-27d81c28eef1d44ddb95980e681d28807e9bce54.tar.xz linux-27d81c28eef1d44ddb95980e681d28807e9bce54.zip | |
drm/i915: push DDI FDI link training on enable to CRT encoder
Reduce encoder specific checks from CRTC code.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/6903136894ffcf47f7511900f3c8d53f760ef6b1.1507200657.git.jani.nikula@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/intel_crt.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index b43e8e16da37..2abe556ccaf5 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -269,6 +269,8 @@ static void hsw_pre_enable_crt(struct intel_encoder *encoder, WARN_ON(!intel_crtc->config->has_pch_encoder); intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, false); + + dev_priv->display.fdi_link_train(intel_crtc, pipe_config); } static void hsw_enable_crt(struct intel_encoder *encoder, diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index b55944d8149b..9f2bf3b3f759 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5523,9 +5523,6 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config, intel_encoders_pre_enable(crtc, pipe_config, old_state); - if (intel_crtc->config->has_pch_encoder) - dev_priv->display.fdi_link_train(intel_crtc, pipe_config); - if (!transcoder_is_dsi(cpu_transcoder)) intel_ddi_enable_pipe_clock(pipe_config); |