From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: [PATCH 04/24] drm/i915: calculate same watermarks
 on Haswell as on Ivy Bridge
Date: Thu, 26 Apr 2012 11:31:42 -0700
Message-ID: <20120426113142.364b249a@jbarnes-x220>
References: <1335464479-648-1-git-send-email-eugeni.dodonov@intel.com>
	<1335464479-648-5-git-send-email-eugeni.dodonov@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 oproxy7-pub.bluehost.com (oproxy7-pub.bluehost.com
	[67.222.55.9])
	by gabe.freedesktop.org (Postfix) with SMTP id D51C9A0F7B
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 26 Apr 2012 11:32:17 -0700 (PDT)
Received: from [64.125.181.70] (helo=jbarnes-x220)
	by box514.bluehost.com with esmtpsa (TLSv1:AES128-SHA:128)
	(Exim 4.76) (envelope-from <jbarnes@virtuousgeek.org>)
	id 1SNTUG-0005z9-Ne
	for intel-gfx@lists.freedesktop.org; Thu, 26 Apr 2012 12:32:16 -0600
In-Reply-To: <1335464479-648-5-git-send-email-eugeni.dodonov@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: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Thu, 26 Apr 2012 15:20:59 -0300
Eugeni Dodonov <eugeni.dodonov@intel.com> wrote:

> Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_pm.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c
> b/drivers/gpu/drm/i915/intel_pm.c index 0552058..06f38ec 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -1694,8 +1694,8 @@ static void sandybridge_update_wm(struct
> drm_device *dev) enabled |= 2;
>  	}
>  
> -	/* IVB has 3 pipes */
> -	if (IS_IVYBRIDGE(dev) &&
> +	/* Only IVB and Haswell has 3 pipes support so far */
> +	if ((IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) &&
>  	    g4x_compute_wm0(dev, 2,
>  			    &sandybridge_display_wm_info, latency,
>  			    &sandybridge_cursor_wm_info, latency,

This could probably just check num_pipes instead.

Jesse