dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

drm/i915: break intel_infoframe_flags into _enable and _frequency 

This will allow us to disable an infoframe without changing its
frequency.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Paulo Zanoni 2012-05-04 17:18:20 -03:00 committed by Daniel Vetter
parent 3e6e63952f
commit fa193ff799
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/gpu/drm/i915/intel_hdmi.c
View File

@ -94,16 +94,33 @@ static u32 intel_infoframe_index(struct dip_infoframe *frame)
return flags;
}
static u32 intel_infoframe_flags(struct dip_infoframe *frame)
static u32 intel_infoframe_enable(struct dip_infoframe *frame)
{
u32 flags = 0;
switch (frame->type) {
case DIP_TYPE_AVI:
flags |= VIDEO_DIP_ENABLE_AVI | VIDEO_DIP_FREQ_VSYNC;
flags |= VIDEO_DIP_ENABLE_AVI;
break;
case DIP_TYPE_SPD:
flags |= VIDEO_DIP_ENABLE_SPD | VIDEO_DIP_FREQ_VSYNC;
flags |= VIDEO_DIP_ENABLE_SPD;
break;
default:
DRM_DEBUG_DRIVER("unknown info frame type %d\n", frame->type);
break;
}
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);
@ -145,7 +162,8 @@ static void i9xx_write_infoframe(struct drm_encoder *encoder,
data++;
}
val |= intel_infoframe_flags(frame);
val |= intel_infoframe_enable(frame);
val |= intel_infoframe_frequency(frame);
I915_WRITE(VIDEO_DIP_CTL, val);
}
@ -176,7 +194,8 @@ static void ironlake_write_infoframe(struct drm_encoder *encoder,
data++;
}
val |= intel_infoframe_flags(frame);
val |= intel_infoframe_enable(frame);
val |= intel_infoframe_frequency(frame);
I915_WRITE(reg, val);
}
@ -207,7 +226,8 @@ static void vlv_write_infoframe(struct drm_encoder *encoder,
data++;
}
val |= intel_infoframe_flags(frame);
val |= intel_infoframe_enable(frame);
val |= intel_infoframe_frequency(frame);
I915_WRITE(reg, val);
}