Skip to content

Commit

Permalink
drm/i915: ibx_write_infoframe can disable AVI
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paulo Zanoni authored and Daniel Vetter committed May 8, 2012
1 parent fdf1250 commit 4dc20c0
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/gpu/drm/i915/intel_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 4dc20c0

Please sign in to comment.