From: Daniel Vetter Date: Tue, 8 May 2012 13:19:06 +0000 (+0200) Subject: drm/i915: s/i9xx_/gm45_ for the gm45 write_infoframe function X-Git-Tag: v3.5-rc1~100^2~25^2~42 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a3da1df7bd1697ff661f7fd310a893815fa52391;p=karo-tx-linux.git drm/i915: s/i9xx_/gm45_ for the gm45 write_infoframe function 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. v2: Use g4x instead of gm45 - it applies to the desktop variant, too. v3: Properly align the paramters of g4x_write_infoframe again, noticed by Paulo Zanoni. Acked-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 4c822e19d960..4db8d7463f4d 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -113,8 +113,8 @@ static u32 intel_infoframe_enable(struct dip_infoframe *frame) return flags; } -static void i9xx_write_infoframe(struct drm_encoder *encoder, - struct dip_infoframe *frame) +static void g4x_write_infoframe(struct drm_encoder *encoder, + struct dip_infoframe *frame) { uint32_t *data = (uint32_t *)frame; struct drm_device *dev = encoder->dev; @@ -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 = g4x_write_infoframe; I915_WRITE(VIDEO_DIP_CTL, 0); } else if (IS_VALLEYVIEW(dev)) { intel_hdmi->write_infoframe = vlv_write_infoframe;