From: Paulo Zanoni Date: Fri, 4 May 2012 20:18:25 +0000 (-0300) Subject: drm/i915: ibx_write_infoframe can disable AVI X-Git-Tag: v3.5-rc1~100^2~25^2~47 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4dc20c0d185132077522dd92a72db79274e13f65;p=karo-tx-linux.git 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 Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index e65ebc2d3ad9..539073ec56bd 100644 --- 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);