aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-05-08 09:19:06 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-05-08 09:37:14 -0400
commita3da1df7bd1697ff661f7fd310a893815fa52391 (patch)
tree7f73881760f37d4c0abaf4c9389352fa50ffbcf3
parent4b24c9331a761d237b8e071941759b80cc580802 (diff)
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 <przanoni@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_hdmi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 4c822e19d96..4db8d7463f4 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)
113 return flags; 113 return flags;
114} 114}
115 115
116static void i9xx_write_infoframe(struct drm_encoder *encoder, 116static void g4x_write_infoframe(struct drm_encoder *encoder,
117 struct dip_infoframe *frame) 117 struct dip_infoframe *frame)
118{ 118{
119 uint32_t *data = (uint32_t *)frame; 119 uint32_t *data = (uint32_t *)frame;
120 struct drm_device *dev = encoder->dev; 120 struct drm_device *dev = encoder->dev;
@@ -654,7 +654,7 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg)
654 intel_hdmi->sdvox_reg = sdvox_reg; 654 intel_hdmi->sdvox_reg = sdvox_reg;
655 655
656 if (!HAS_PCH_SPLIT(dev)) { 656 if (!HAS_PCH_SPLIT(dev)) {
657 intel_hdmi->write_infoframe = i9xx_write_infoframe; 657 intel_hdmi->write_infoframe = g4x_write_infoframe;
658 I915_WRITE(VIDEO_DIP_CTL, 0); 658 I915_WRITE(VIDEO_DIP_CTL, 0);
659 } else if (IS_VALLEYVIEW(dev)) { 659 } else if (IS_VALLEYVIEW(dev)) {
660 intel_hdmi->write_infoframe = vlv_write_infoframe; 660 intel_hdmi->write_infoframe = vlv_write_infoframe;