aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2012-10-23 16:30:04 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-10-26 04:24:50 -0400
commite6f0bfc4fb963da9e945ebc6330db9a4d756ba78 (patch)
tree1b4761e46bc15d29301f7cf886c80b77d3be5e80 /drivers/gpu/drm/i915
parentb5e508d4c01b4aab6abb90488603f9bcfbb64b52 (diff)
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')
-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)
954 if (crtc->mode.flags & DRM_MODE_FLAG_PHSYNC) 954 if (crtc->mode.flags & DRM_MODE_FLAG_PHSYNC)
955 temp |= TRANS_DDI_PHSYNC; 955 temp |= TRANS_DDI_PHSYNC;
956 956
957 if (cpu_transcoder == TRANSCODER_EDP) {
958 switch (pipe) {
959 case PIPE_A:
960 temp |= TRANS_DDI_EDP_INPUT_A_ONOFF;
961 break;
962 case PIPE_B:
963 temp |= TRANS_DDI_EDP_INPUT_B_ONOFF;
964 break;
965 case PIPE_C:
966 temp |= TRANS_DDI_EDP_INPUT_C_ONOFF;
967 break;
968 default:
969 BUG();
970 break;
971 }
972 }
973
957 if (type == INTEL_OUTPUT_HDMI) { 974 if (type == INTEL_OUTPUT_HDMI) {
958 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder); 975 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
959 976