소스 검색

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
Jani Nikula 7 년 전
부모
커밋
27d81c28ee
2개의 변경된 파일2개의 추가작업 그리고 3개의 파일을 삭제
  1. 2 0
      drivers/gpu/drm/i915/intel_crt.c
  2. 0 3
      drivers/gpu/drm/i915/intel_display.c

+ 2 - 0
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);
 	WARN_ON(!intel_crtc->config->has_pch_encoder);
 
 
 	intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, false);
 	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,
 static void hsw_enable_crt(struct intel_encoder *encoder,

+ 0 - 3
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);
 	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))
 	if (!transcoder_is_dsi(cpu_transcoder))
 		intel_ddi_enable_pipe_clock(pipe_config);
 		intel_ddi_enable_pipe_clock(pipe_config);