drm/i915: start writing infoframes at address 0 on gen 4
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Fri, 4 May 2012 20:18:18 +0000 (17:18 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 8 May 2012 12:04:15 +0000 (14:04 +0200)
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>
drivers/gpu/drm/i915/intel_hdmi.c

index b84d19d0eaed2136a3bcf5a5f9bfa8d54264f8eb..af88313d72d039c8b83b16a07ac5cc031db3d476 100644 (file)
@@ -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;