public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH 2/3] drm/i915: s/i9xx_/gm45_ for the gm45 write_infoframe function
Date: Tue,  8 May 2012 14:41:01 +0200	[thread overview]
Message-ID: <1336480862-6319-2-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1336480862-6319-1-git-send-email-daniel.vetter@ffwll.ch>

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@ffwll.ch>
---
 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

  reply	other threads:[~2012-05-08 12:39 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-08 12:41 [PATCH 1/3] drm/i915: replace intel_infoframe_freq with VIDEO_DIP_FREQ_VSYNC Daniel Vetter
2012-05-08 12:41 ` Daniel Vetter [this message]
2012-05-08 13:15   ` [PATCH 2/3] drm/i915: s/i9xx_/gm45_ for the gm45 write_infoframe function Daniel Vetter
2012-05-08 13:19   ` [PATCH] " Daniel Vetter
2012-05-08 12:41 ` [PATCH 3/3] drm/i915: s/intel_infoframe/gm45_infoframe Daniel Vetter
2012-05-08 13:18   ` [PATCH] " Daniel Vetter
2012-05-08 13:38     ` Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1336480862-6319-2-git-send-email-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox