From patchwork Sat Oct 23 04:07:57 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Peter Clifton <pcjc2@cam.ac.uk>
X-Patchwork-Id: 278811
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9N489sY029613
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Sat, 23 Oct 2010 04:08:30 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id 703279E92A
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Fri, 22 Oct 2010 21:08:09 -0700 (PDT)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from ppsw-52.csi.cam.ac.uk (ppsw-52.csi.cam.ac.uk [131.111.8.152])
	by gabe.freedesktop.org (Postfix) with ESMTP id 977159E789
	for <intel-gfx@lists.freedesktop.org>;
	Fri, 22 Oct 2010 21:07:59 -0700 (PDT)
X-Cam-AntiVirus: no malware found
X-Cam-SpamDetails: not scanned
X-Cam-ScannerInfo: http://www.cam.ac.uk/cs/email/scanner/
Received: from cpc1-cmbg11-0-0-cust238.5-4.cable.virginmedia.com
	([86.22.72.239]:37425 helo=[192.168.1.4])
	by ppsw-52.csi.cam.ac.uk (smtp.hermes.cam.ac.uk [131.111.8.159]:465)
	with esmtpsa (LOGIN:pcjc2) (SSLv3:DHE-RSA-CAMELLIA256-SHA:256)
	id 1P9VOg-0007Un-ET (Exim 4.72)
	(return-path <pcjc2@cam.ac.uk>); Sat, 23 Oct 2010 05:07:58 +0100
From: Peter Clifton <pcjc2@cam.ac.uk>
To: Chris Wilson <chris@chris-wilson.co.uk>
In-Reply-To: <1287804946.9701.3.camel@pcjc2lap>
References: <1287751996.19922.4.camel@pcjc2lap>
	<849307$a3hfvt@azsmga001.ch.intel.com>
	<1287774644.17191.9.camel@pcjc2lap>
	<5b55a1$ien4q1@fmsmga002.fm.intel.com>
	<1287804946.9701.3.camel@pcjc2lap>
Date: Sat, 23 Oct 2010 05:07:57 +0100
Message-ID: <1287806877.2423.3.camel@pcjc2lap>
Mime-Version: 1.0
X-Mailer: Evolution 2.30.3 
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] Corruption in glxgears with Compiz
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: Intel graphics driver community testing & development
	<intel-gfx.lists.freedesktop.org>
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+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org
Errors-To: 
 intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Sat, 23 Oct 2010 04:08:30 +0000 (UTC)


diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 9290f02..868a399 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3759,7 +3759,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
         */
        dev->invalidate_domains = 0;
        dev->flush_domains = 0;
-       dev_priv->mm.flush_rings = 0;
+       dev_priv->mm.flush_rings = ring->id;
 
        for (i = 0; i < args->buffer_count; i++) {
                struct drm_gem_object *obj = object_list[i];