From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kenneth Graunke <kenneth@whitecape.org>
Subject: Re: [PATCH] i965: Fix the VS thread limits for GT1,
 and clarify the WM limits on both.
Date: Tue, 29 Mar 2011 17:22:18 -0700
Message-ID: <4D9277BA.3040503@whitecape.org>
References: <1301437027-28101-1-git-send-email-eric@anholt.net>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from homiemail-a6.g.dreamhost.com (caiajhbdcaib.dreamhost.com
	[208.97.132.81])
	by gabe.freedesktop.org (Postfix) with ESMTP id B70779E7A8
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 29 Mar 2011 17:22:20 -0700 (PDT)
Received: from homiemail-a6.g.dreamhost.com (localhost [127.0.0.1])
	by homiemail-a6.g.dreamhost.com (Postfix) with ESMTP id 23169598070
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 29 Mar 2011 17:22:20 -0700 (PDT)
Received: from [192.168.1.154] (fruit.freedesktop.org [131.252.210.190])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	(Authenticated sender: kenneth@whitecape.org)
	by homiemail-a6.g.dreamhost.com (Postfix) with ESMTPSA id ECDE259806B
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 29 Mar 2011 17:22:19 -0700 (PDT)
In-Reply-To: <1301437027-28101-1-git-send-email-eric@anholt.net>
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 03/29/2011 03:17 PM, Eric Anholt wrote:
> ---
>
> I don't have GT1 to test with.  Does this fix VS regressions for
> people with that hardware?

Me neither, but it sure looks correct.

[snip]
> diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
> index 9483ec6..a74ba5c 100644
> --- a/src/mesa/drivers/dri/i965/brw_context.c
> +++ b/src/mesa/drivers/dri/i965/brw_context.c
> @@ -183,8 +183,17 @@ GLboolean brwCreateContext( int api,
>      /* WM maximum threads is number of EUs times number of threads per EU. */
>      if (intel->gen>= 6) {
>         brw->urb.size = 1024;
> -      brw->vs_max_threads = 60;
> -      brw->wm_max_threads = 80;
> +      if (IS_GT2(intel->intelScreen->deviceID)) {
> +	 /* This could possibly be 80, but is supposed to require
> +	  * disabling of WIZ hashing (bit 6 of GT_MODE, 0x20d0) and a
> +	  * GPU reset to change.
> +	  */
> +	 brw->wm_max_threads = 40;
> +	 brw->vs_max_threads = 60;
> +      } else {
> +	 brw->wm_max_threads = 40;
> +	 brw->vs_max_threads = 24;
> +      }

Presumably 60 = 12 EUs * 5 threads/EU (for GT2), while 24 = 6 EUs * 4 
threads/EU (for GT1).  If so, a comment to that effect would be nice...

I still have no idea where 40/80 come from.

[snip]
> diff --git a/src/mesa/drivers/dri/intel/intel_chipset.h b/src/mesa/drivers/dri/intel/intel_chipset.h
> index 4ff9140..f7dcf47 100644
> --- a/src/mesa/drivers/dri/intel/intel_chipset.h
> +++ b/src/mesa/drivers/dri/intel/intel_chipset.h

Drop the intel_chipset.h changes, I just committed an equivalent patch.