From: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date: Fri, 4 May 2012 20:18:18 +0000 (-0300)
Subject: drm/i915: start writing infoframes at address 0 on gen 4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1d4f85ac2d5ef1892deba2a3df8a5695645418c8;p=~shefty%2Frdma-dev.git

drm/i915: start writing infoframes at address 0 on gen 4

Make sure we're doing the right thing, just like we do on gen5+.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index b84d19d0eae..af88313d72d 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -132,7 +132,7 @@ static void i9xx_write_infoframe(struct drm_encoder *encoder,
 	else
 		return;
 
-	val &= ~VIDEO_DIP_SELECT_MASK;
+	val &= ~(VIDEO_DIP_SELECT_MASK | 0xf); /* clear DIP data offset */
 	val |= intel_infoframe_index(frame);
 
 	val |= VIDEO_DIP_ENABLE;