summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ddi.c
diff options
context:
space:
mode:
authorPaulo Zanoni2012-10-23 22:30:04 +0200
committerDaniel Vetter2012-10-26 10:24:50 +0200
commite6f0bfc4fb963da9e945ebc6330db9a4d756ba78 (patch)
tree1b4761e46bc15d29301f7cf886c80b77d3be5e80 /drivers/gpu/drm/i915/intel_ddi.c
parentdrm/i915: implement workaround for VTOTAL when using TRANSCODER_EDP (diff)
downloadkernel-qcow2-linux-e6f0bfc4fb963da9e945ebc6330db9a4d756ba78.tar.gz
kernel-qcow2-linux-e6f0bfc4fb963da9e945ebc6330db9a4d756ba78.tar.xz
kernel-qcow2-linux-e6f0bfc4fb963da9e945ebc6330db9a4d756ba78.zip
drm/i915: select the correct pipe when using TRANSCODER_EDP
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ddi.c')
-rw-r--r--drivers/gpu/drm/i915/intel_ddi.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index c3d06532e9c5..7ea373ffe7a1 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -954,6 +954,23 @@ void intel_ddi_enable_pipe_func(struct drm_crtc *crtc)
if (crtc->mode.flags & DRM_MODE_FLAG_PHSYNC)
temp |= TRANS_DDI_PHSYNC;
+ if (cpu_transcoder == TRANSCODER_EDP) {
+ switch (pipe) {
+ case PIPE_A:
+ temp |= TRANS_DDI_EDP_INPUT_A_ONOFF;
+ break;
+ case PIPE_B:
+ temp |= TRANS_DDI_EDP_INPUT_B_ONOFF;
+ break;
+ case PIPE_C:
+ temp |= TRANS_DDI_EDP_INPUT_C_ONOFF;
+ break;
+ default:
+ BUG();
+ break;
+ }
+ }
+
if (type == INTEL_OUTPUT_HDMI) {
struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);