From patchwork Fri Feb 19 10:52:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 80607 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1JAqedn031029 for ; Fri, 19 Feb 2010 10:53:19 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EC22BA090F; Fri, 19 Feb 2010 02:52:27 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail.ffwll.ch (cable-static-49-187.intergga.ch [157.161.49.187]) by gabe.freedesktop.org (Postfix) with ESMTP id 5BF679E85A for ; Fri, 19 Feb 2010 02:52:21 -0800 (PST) Received: by mail.ffwll.ch (Postfix, from userid 1000) id 1DB9B20C230; Fri, 19 Feb 2010 11:52:20 +0100 (CET) X-Spam-ASN: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on orange.ffwll.ch X-Spam-Level: X-Spam-Hammy: 0.000-+--struct, 0.000-+--100644, 0.000-+--signed-off-by X-Spam-Status: No, score=-4.4 required=6.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Spammy: 0.971-+--H*m:ffwll, 0.964-+--H*Ad:U*daniel.vetter, 0.956-+--H*r:mail.ffwll.ch Received: from biene (unknown [192.168.23.129]) by mail.ffwll.ch (Postfix) with ESMTP id 72CEF20C231; Fri, 19 Feb 2010 11:51:56 +0100 (CET) Received: from daniel by biene with local (Exim 4.71) (envelope-from ) id 1NiQSy-0001Kd-5w; Fri, 19 Feb 2010 11:52:12 +0100 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Fri, 19 Feb 2010 11:52:01 +0100 Message-Id: X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <8663bd29c6603d66e0c696dcf6436e0b29fde6b2.1266569618.git.daniel.vetter@ffwll.ch> References: <76a6bb81cf7bed8c4822d3874ddfab0ca0bd54db.1266569618.git.daniel.vetter@ffwll.ch> <4cf8f7abd804d3b17122614b604fdb919d34e0aa.1266569618.git.daniel.vetter@ffwll.ch> <4e151f5ef2b8aa59406870584005e90aeec9ddca.1266569618.git.daniel.vetter@ffwll.ch> <35a6e2624b95d549828a632abe2f0cd32aba25aa.1266569618.git.daniel.vetter@ffwll.ch> <8663bd29c6603d66e0c696dcf6436e0b29fde6b2.1266569618.git.daniel.vetter@ffwll.ch> In-Reply-To: References: Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 8/9] drm/i915: clean-up i915_gem_flush_gpu_write_domain X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 19 Feb 2010 10:53:19 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 6c72166..11c50e6 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2725,7 +2725,6 @@ static void i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj) { struct drm_device *dev = obj->dev; - uint32_t seqno; uint32_t old_write_domain; if ((obj->write_domain & I915_GEM_GPU_DOMAINS) == 0) @@ -2734,9 +2733,8 @@ i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj) /* Queue the GPU write cache flushing we need. */ old_write_domain = obj->write_domain; i915_gem_flush(dev, 0, obj->write_domain); - seqno = i915_add_request(dev, NULL, obj->write_domain); + (void) i915_add_request(dev, NULL, obj->write_domain); BUG_ON(obj->write_domain); - i915_gem_object_move_to_active(obj, seqno); trace_i915_gem_object_change_domain(obj, obj->read_domains,