|
@@ -5771,6 +5771,11 @@ static int haswell_crtc_mode_set(struct drm_crtc *crtc,
|
|
|
num_connectors++;
|
|
|
}
|
|
|
|
|
|
+ if (is_cpu_edp)
|
|
|
+ intel_crtc->cpu_transcoder = TRANSCODER_EDP;
|
|
|
+ else
|
|
|
+ intel_crtc->cpu_transcoder = pipe;
|
|
|
+
|
|
|
/* We are not sure yet this won't happen. */
|
|
|
WARN(!HAS_PCH_LPT(dev), "Unexpected PCH type %d\n",
|
|
|
INTEL_PCH_TYPE(dev));
|
|
@@ -5837,11 +5842,6 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
|
|
|
int pipe = intel_crtc->pipe;
|
|
|
int ret;
|
|
|
|
|
|
- if (IS_HASWELL(dev) && intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP))
|
|
|
- intel_crtc->cpu_transcoder = TRANSCODER_EDP;
|
|
|
- else
|
|
|
- intel_crtc->cpu_transcoder = pipe;
|
|
|
-
|
|
|
drm_vblank_pre_modeset(dev, pipe);
|
|
|
|
|
|
ret = dev_priv->display.crtc_mode_set(crtc, mode, adjusted_mode,
|