From patchwork Sat Oct 23 03:35:46 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: 278801
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 o9N3Zxba013905
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Sat, 23 Oct 2010 03:36:20 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id 45DCB9E93C
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Fri, 22 Oct 2010 20:35:59 -0700 (PDT)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from ppsw-51.csi.cam.ac.uk (ppsw-51.csi.cam.ac.uk [131.111.8.151])
	by gabe.freedesktop.org (Postfix) with ESMTP id CDD7E9E789
	for <intel-gfx@lists.freedesktop.org>;
	Fri, 22 Oct 2010 20:35:48 -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]:44503 helo=[192.168.1.4])
	by ppsw-51.csi.cam.ac.uk (smtp.hermes.cam.ac.uk [131.111.8.158]:465)
	with esmtpsa (LOGIN:pcjc2) (SSLv3:DHE-RSA-CAMELLIA256-SHA:256)
	id 1P9UtW-00060D-ZS (Exim 4.72)
	(return-path <pcjc2@cam.ac.uk>); Sat, 23 Oct 2010 04:35:47 +0100
From: Peter Clifton <pcjc2@cam.ac.uk>
To: Chris Wilson <chris@chris-wilson.co.uk>
In-Reply-To: <5b55a1$ien4q1@fmsmga002.fm.intel.com>
References: <1287751996.19922.4.camel@pcjc2lap>
	<849307$a3hfvt@azsmga001.ch.intel.com>
	<1287774644.17191.9.camel@pcjc2lap>
	<5b55a1$ien4q1@fmsmga002.fm.intel.com>
Date: Sat, 23 Oct 2010 04:35:46 +0100
Message-ID: <1287804946.9701.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 03:36:20 +0000 (UTC)


diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index cf27655..a9d528e 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1901,7 +1901,9 @@ i915_gem_flush(struct drm_device *dev,
                drm_agp_chipset_flush(dev);
 
        if ((flush_domains | invalidate_domains) & I915_GEM_GPU_DOMAINS) {
-               if (flush_rings & RING_RENDER)
+//        if (1) {
+//             if (flush_rings & RING_RENDER)
+               if (1)
                        i915_gem_flush_ring(dev,
                                            &dev_priv->render_ring,
                                            invalidate_domains, flush_domains);
@@ -4197,6 +4199,7 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
                 * flush earlier is beneficial.
                 */
                if (obj->write_domain & I915_GEM_GPU_DOMAINS) {
+//             if (obj->write_domain) {
                        i915_gem_flush_ring(dev,
                                            obj_priv->ring,
                                            0, obj->write_domain);