From patchwork Sat Oct 23 09:10:24 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Chris Wilson <chris@chris-wilson.co.uk>
X-Patchwork-Id: 279071
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 o9N9Ab1x019360
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Sat, 23 Oct 2010 09:10:59 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id 819E79E889
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Sat, 23 Oct 2010 02:10:35 -0700 (PDT)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
	by gabe.freedesktop.org (Postfix) with ESMTP id D5E3A9E761
	for <intel-gfx@lists.freedesktop.org>;
	Sat, 23 Oct 2010 02:10:27 -0700 (PDT)
Received: from orsmga002.jf.intel.com ([10.7.209.21])
	by orsmga102.jf.intel.com with ESMTP; 23 Oct 2010 02:10:27 -0700
Message-Id: <b9dded$gsebna@orsmga002.jf.intel.com>
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.58,227,1286175600"; d="scan'208";a="566701802"
Received: from unknown (HELO cwilso3-mobl.ger.corp.intel.com)
	([10.255.16.56])
	by orsmga002.jf.intel.com with SMTP; 23 Oct 2010 02:10:25 -0700
Received: by cwilso3-mobl.ger.corp.intel.com (sSMTP sendmail emulation);
	Sat, 23 Oct 2010 10:10:24 +0100
Date: Sat, 23 Oct 2010 10:10:24 +0100
To: Peter Clifton <pcjc2@cam.ac.uk>
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>
	<1287806877.2423.3.camel@pcjc2lap>
From: Chris Wilson <chris@chris-wilson.co.uk>
In-Reply-To: <1287806877.2423.3.camel@pcjc2lap>
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>
MIME-Version: 1.0
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 09:10:59 +0000 (UTC)


diff --git a/drivers/gpu/drm/i915/i915_gem.c
b/drivers/gpu/drm/i915/i915_gem.c
index 9290f02..e7f27a5 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3078,7 +3078,8 @@ i915_gem_object_set_to_cpu_domain(struct
drm_gem_object *o
bj, int write)
  *		drm_agp_chipset_flush
  */
 static void
-i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj)
+i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj,
+				  struct intel_ring_buffer *ring)
 {