From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH 21/37] drm/i915: calculate watermarks on Gen7 archs in one place Date: Thu, 22 Mar 2012 10:52:50 +0000 Message-ID: References: <1332378612-3814-1-git-send-email-eugeni.dodonov@intel.com> <1332378612-3814-22-git-send-email-eugeni.dodonov@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga14.intel.com (mga14.intel.com [143.182.124.37]) by gabe.freedesktop.org (Postfix) with ESMTP id EABB49EE9D for ; Thu, 22 Mar 2012 03:52:56 -0700 (PDT) In-Reply-To: <1332378612-3814-22-git-send-email-eugeni.dodonov@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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-gfx@lists.freedesktop.org Cc: Eugeni Dodonov List-Id: intel-gfx@lists.freedesktop.org On Wed, 21 Mar 2012 22:09:56 -0300, Eugeni Dodonov wrote: > Signed-off-by: Eugeni Dodonov > --- > 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. ;-) -Chris -- Chris Wilson, Intel Open Source Technology Centre