From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [PATCH 1/5] drm/i915: Initialise g4x watermarks for
	disabled pipes
Date: Wed, 06 Apr 2011 09:02:22 +0100
Message-ID: <b9dded$ijcf7l@orsmga002.jf.intel.com>
References: <1301995458-2699-1-git-send-email-chris@chris-wilson.co.uk>
	<1301995458-2699-2-git-send-email-chris@chris-wilson.co.uk>
	<yunmxk4fmd6.fsf@aiko.keithp.com>
	<b7da2f$r004or@fmsmga001.fm.intel.com>
	<yunipusmbt0.fsf@aiko.keithp.com>
	<0d30dc$lntgob@orsmga001.jf.intel.com>
	<yun8vvnu8z1.fsf@aiko.keithp.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 mga02.intel.com (mga02.intel.com [134.134.136.20])
	by gabe.freedesktop.org (Postfix) with ESMTP id 8A4429E75A
	for <intel-gfx@lists.freedesktop.org>;
	Wed,  6 Apr 2011 01:02:25 -0700 (PDT)
In-Reply-To: <yun8vvnu8z1.fsf@aiko.keithp.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: Keith Packard <keithp@keithp.com>, intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Wed, 06 Apr 2011 00:36:50 -0700, Keith Packard <keithp@keithp.com> wrote:
> On Wed, 06 Apr 2011 07:59:37 +0100, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> 
> > I'd prefer to keep the mucking around with intel_watermak_params in the
> > one spot. How about:
> 
> My concern is that g4x_compute_wm0 is now different from
> ironlake_compute_wm0, which seems like a potential trap for the
> unwary.

A trap that I wrote for myself and fell into. The goal was to reduce the
number of copies of the watermark computation by gradual refactoring.

Looks like we can now indeed merge g4x_compute_wm0 and ironlake_compute_wm0
and ignore the off-values for gen5+.

So fix the use of uninitialised values for -fixes and remove the redundant
copy in -next?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre