On Tue, May 08, 2012 at 02:41:01PM +0200, Daniel Vetter wrote:
> Generally we call stuff with i9xx_ when it's valid for gen3+. But
> gen3 and early gen4 only support hdmi with sdvo cards, and writing
> infoframes works completely different there.
>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
Bikeshed fail, the usual prefix for gen4.5 is actually g4x ... I'll redo
the patches.
-Daniel
> ---
> drivers/gpu/drm/i915/intel_hdmi.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 4c822e1..65e033a 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -113,7 +113,7 @@ static u32 intel_infoframe_enable(struct dip_infoframe *frame)
> return flags;
> }
>
> -static void i9xx_write_infoframe(struct drm_encoder *encoder,
> +static void gm45_write_infoframe(struct drm_encoder *encoder,
> struct dip_infoframe *frame)
> {
> uint32_t *data = (uint32_t *)frame;
> @@ -654,7 +654,7 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg)
> intel_hdmi->sdvox_reg = sdvox_reg;
>
> if (!HAS_PCH_SPLIT(dev)) {
> - intel_hdmi->write_infoframe = i9xx_write_infoframe;
> + intel_hdmi->write_infoframe = gm45_write_infoframe;
> I915_WRITE(VIDEO_DIP_CTL, 0);
> } else if (IS_VALLEYVIEW(dev)) {
> intel_hdmi->write_infoframe = vlv_write_infoframe;
> --
> 1.7.10
>
--
Daniel Vetter
Mail: daniel at ffwll.ch
Mobile: +41 (0)79 365 57 48
