From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH 2/3] drm/i915: s/i9xx_/gm45_ for the gm45
 write_infoframe function
Date: Tue, 8 May 2012 15:15:53 +0200
Message-ID: <20120508131553.GO4802@phenom.ffwll.local>
References: <1336480862-6319-1-git-send-email-daniel.vetter@ffwll.ch>
	<1336480862-6319-2-git-send-email-daniel.vetter@ffwll.ch>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49])
	by gabe.freedesktop.org (Postfix) with ESMTP id 45F479E836
	for <intel-gfx@lists.freedesktop.org>;
	Tue,  8 May 2012 06:14:45 -0700 (PDT)
Received: by eekd17 with SMTP id d17so653940eek.36
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 08 May 2012 06:14:44 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1336480862-6319-2-git-send-email-daniel.vetter@ffwll.ch>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
List-Id: intel-gfx@lists.freedesktop.org

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@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@ffwll.ch
Mobile: +41 (0)79 365 57 48