aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-11-19 12:06:51 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-11-21 11:45:05 -0500
commit8fed6193736bf22e0e44c03ee783761e9cc37238 (patch)
treeb7d05cc1d52ea5580e7d4aa14078e694993f4f23 /drivers
parentc9839303d186d6270f570ff3c5f56c2327958086 (diff)
drm/i915: Enable DP audio for Haswell
This patch adds the missing code to send ELD for Haswell DisplayPort, based on Xingchao's original patch. A test was performed with HSW-D machine and NEC EA232Wmi DP monitor. Cc: Xingchao Wang <xingchao.wang@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_ddi.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 58f50ebdbef6..d706d538e8b7 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -669,6 +669,15 @@ static void intel_ddi_mode_set(struct drm_encoder *encoder,
669 break; 669 break;
670 } 670 }
671 671
672 if (intel_dp->has_audio) {
673 DRM_DEBUG_DRIVER("DP audio on pipe %c on DDI\n",
674 pipe_name(intel_crtc->pipe));
675
676 /* write eld */
677 DRM_DEBUG_DRIVER("DP audio: write eld information\n");
678 intel_write_eld(encoder, adjusted_mode);
679 }
680
672 intel_dp_init_link_config(intel_dp); 681 intel_dp_init_link_config(intel_dp);
673 682
674 } else if (type == INTEL_OUTPUT_HDMI) { 683 } else if (type == INTEL_OUTPUT_HDMI) {