From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 04/24] drm/i915: calculate same watermarks on Haswell as on Ivy Bridge Date: Mon, 30 Apr 2012 16:54:39 -0700 Message-ID: <20120430165439.543edd25@jbarnes-desktop> References: <20120426113142.364b249a@jbarnes-x220> <1335466304-8141-1-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 oproxy7-pub.bluehost.com (oproxy7-pub.bluehost.com [67.222.55.9]) by gabe.freedesktop.org (Postfix) with SMTP id 184F99E82D for ; Mon, 30 Apr 2012 16:54:42 -0700 (PDT) In-Reply-To: <1335466304-8141-1-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: Eugeni Dodonov Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Thu, 26 Apr 2012 15:51:44 -0300 Eugeni Dodonov wrote: > v2: check for num_pipe instead, as suggested by Jesse > > CC: Jesse Barnes > Signed-off-by: Eugeni Dodonov > --- > drivers/gpu/drm/i915/intel_pm.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 0552058..4e0af68 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -1694,8 +1694,7 @@ static void sandybridge_update_wm(struct drm_device *dev) > enabled |= 2; > } > > - /* IVB has 3 pipes */ > - if (IS_IVYBRIDGE(dev) && > + if ((dev_priv->num_pipe == 2) && > g4x_compute_wm0(dev, 2, > &sandybridge_display_wm_info, latency, > &sandybridge_cursor_wm_info, latency, As noted on IRC, a cleanup (one of many for the WM code) would be to use a loop for calculating the per-pipe watermarks. But that can be done on top. Reviewed-by: Jesse Barnes -- Jesse Barnes, Intel Open Source Technology Center