From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH 07/29] drm/i915: calculate same watermarks on Haswell as on Ivy Bridge Date: Fri, 13 Apr 2012 21:27:34 +0100 Message-ID: <1334348861_415343@CP5-2952> References: <1334347745-11743-1-git-send-email-eugeni.dodonov@intel.com> <1334347745-11743-8-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 fireflyinternet.com (smtp.fireflyinternet.com [109.228.6.236]) by gabe.freedesktop.org (Postfix) with ESMTP id DBC389E7EB for ; Fri, 13 Apr 2012 13:27:50 -0700 (PDT) In-Reply-To: <1334347745-11743-8-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 Fri, 13 Apr 2012 17:08:43 -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 36f6b8e..60b1540 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -4921,7 +4921,7 @@ void sandybridge_update_wm(struct drm_device *dev) > } > > /* IVB has 3 pipes */ > - if (IS_IVYBRIDGE(dev) && > + if ((IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) && Would checking the number of pipes here bere more informative? Otherwise the comment is stale. -Chris -- Chris Wilson, Intel Open Source Technology Centre