From b56d4f258b81a9302e87eb0189954860801547af Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 19 Nov 2012 18:06:51 +0100
Subject: [PATCH] --- yaml --- r: 345488 b: refs/heads/master c:
 8fed6193736bf22e0e44c03ee783761e9cc37238 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/gpu/drm/i915/intel_ddi.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 13cdeeccf60d..ff2651d85e27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9839303d186d6270f570ff3c5f56c2327958086
+refs/heads/master: 8fed6193736bf22e0e44c03ee783761e9cc37238
diff --git a/trunk/drivers/gpu/drm/i915/intel_ddi.c b/trunk/drivers/gpu/drm/i915/intel_ddi.c
index 58f50ebdbef6..d706d538e8b7 100644
--- a/trunk/drivers/gpu/drm/i915/intel_ddi.c
+++ b/trunk/drivers/gpu/drm/i915/intel_ddi.c
@@ -669,6 +669,15 @@ static void intel_ddi_mode_set(struct drm_encoder *encoder,
 			break;
 		}
 
+		if (intel_dp->has_audio) {
+			DRM_DEBUG_DRIVER("DP audio on pipe %c on DDI\n",
+					 pipe_name(intel_crtc->pipe));
+
+			/* write eld */
+			DRM_DEBUG_DRIVER("DP audio: write eld information\n");
+			intel_write_eld(encoder, adjusted_mode);
+		}
+
 		intel_dp_init_link_config(intel_dp);
 
 	} else if (type == INTEL_OUTPUT_HDMI) {