Skip to content

Commit

Permalink
drm/i915: replace intel_infoframe_freq with VIDEO_DIP_FREQ_VSYNC
Browse files Browse the repository at this point in the history
Simplifies things because for all the infoframes we care about,
we always send them on each vblank. Also, this gets rid of one
of the hw specific functions mislabelled with the intel_ prefix -
hsw will completely change how this works!

Acked-by: Paulo Zanoni <przanoni@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed May 8, 2012
1 parent acb87df commit 4b24c93
Showing 1 changed file with 4 additions and 21 deletions.
25 changes: 4 additions & 21 deletions drivers/gpu/drm/i915/intel_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,23 +113,6 @@ static u32 intel_infoframe_enable(struct dip_infoframe *frame)
return flags;
}

static u32 intel_infoframe_frequency(struct dip_infoframe *frame)
{
u32 flags = 0;

switch (frame->type) {
case DIP_TYPE_AVI:
case DIP_TYPE_SPD:
flags |= VIDEO_DIP_FREQ_VSYNC;
break;
default:
DRM_DEBUG_DRIVER("unknown info frame type %d\n", frame->type);
break;
}

return flags;
}

static void i9xx_write_infoframe(struct drm_encoder *encoder,
struct dip_infoframe *frame)
{
Expand Down Expand Up @@ -165,7 +148,7 @@ static void i9xx_write_infoframe(struct drm_encoder *encoder,

val |= intel_infoframe_enable(frame);
val &= ~VIDEO_DIP_FREQ_MASK;
val |= intel_infoframe_frequency(frame);
val |= VIDEO_DIP_FREQ_VSYNC;

I915_WRITE(VIDEO_DIP_CTL, val);
}
Expand Down Expand Up @@ -215,7 +198,7 @@ static void ibx_write_infoframe(struct drm_encoder *encoder,

val |= intel_infoframe_enable(frame);
val &= ~VIDEO_DIP_FREQ_MASK;
val |= intel_infoframe_frequency(frame);
val |= VIDEO_DIP_FREQ_VSYNC;

I915_WRITE(reg, val);
}
Expand Down Expand Up @@ -255,7 +238,7 @@ static void cpt_write_infoframe(struct drm_encoder *encoder,

val |= intel_infoframe_enable(frame);
val &= ~VIDEO_DIP_FREQ_MASK;
val |= intel_infoframe_frequency(frame);
val |= VIDEO_DIP_FREQ_VSYNC;

I915_WRITE(reg, val);
}
Expand Down Expand Up @@ -289,7 +272,7 @@ static void vlv_write_infoframe(struct drm_encoder *encoder,

val |= intel_infoframe_enable(frame);
val &= ~VIDEO_DIP_FREQ_MASK;
val |= intel_infoframe_frequency(frame);
val |= VIDEO_DIP_FREQ_VSYNC;

I915_WRITE(reg, val);
}
Expand Down

0 comments on commit 4b24c93

Please sign in to comment.