From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH 21/37] drm/i915: calculate watermarks on
 Gen7 archs in one place
Date: Thu, 22 Mar 2012 12:13:38 +0100
Message-ID: <20120322111338.GJ6195@phenom.ffwll.local>
References: <1332378612-3814-1-git-send-email-eugeni.dodonov@intel.com>
	<1332378612-3814-22-git-send-email-eugeni.dodonov@intel.com>
	<c55c5d$2ck7mb@AZSMGA002.ch.intel.com>
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-we0-f177.google.com (mail-we0-f177.google.com
	[74.125.82.177])
	by gabe.freedesktop.org (Postfix) with ESMTP id E89829E761
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 22 Mar 2012 04:12:54 -0700 (PDT)
Received: by werp11 with SMTP id p11so2081992wer.36
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 22 Mar 2012 04:12:54 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <c55c5d$2ck7mb@AZSMGA002.ch.intel.com>
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: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org, Eugeni Dodonov <eugeni.dodonov@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

On Thu, Mar 22, 2012 at 10:52:50AM +0000, Chris Wilson wrote:
> On Wed, 21 Mar 2012 22:09:56 -0300, Eugeni Dodonov <eugeni.dodonov@intel.com> wrote:
> > Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_display.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index c225de4..46633fe 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -4649,7 +4649,7 @@ void sandybridge_update_wm(struct drm_device *dev)
> >  	}
> >  
> >  	/* IVB has 3 pipes */
> > -	if (IS_IVYBRIDGE(dev) &&
> > +	if (IS_GEN7(dev) &&
> 
> I can sense a Jesse rant about needing proper names to distinguish gen7
> render engines versus gen7 displays. But maybe another time. ;-)

You already have a Daniel rant somewhere later complaining that some of
the s/IS_IVB/IS_GEN7/ will surely blow up on vlv ;-)
-Daniel
-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48