drm/i915: ibx_write_infoframe can disable AVI

IBX does not need the workaround used in cpt_write_infoframe that
requires the AVI frame to be enabled while being updated.

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 e65ebc2d3ad909ecff532240f707a756c0234db2..539073ec56bd63ddb609eebdf850387383e93ce4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -187,13 +187,7 @@ static void ibx_write_infoframe(struct drm_encoder *encoder,
        val &= ~(VIDEO_DIP_SELECT_MASK | 0xf); /* clear DIP data offset */
        val |= intel_infoframe_index(frame);
 
-       /* The DIP control register spec says that we need to update the AVI
-        * infoframe without clearing its enable bit */
-       if (frame->type == DIP_TYPE_AVI)
-               val |= VIDEO_DIP_ENABLE_AVI;
-       else
-               val &= ~intel_infoframe_enable(frame);
-
+       val &= ~intel_infoframe_enable(frame);
        val |= VIDEO_DIP_ENABLE;
 
        I915_WRITE(reg, val);