From patchwork Mon Feb 1 12:59:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 76057 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 o11D4u3D017743 for ; Mon, 1 Feb 2010 13:05:35 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 553B49EDC3; Mon, 1 Feb 2010 05:04:55 -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 B97239ED8F for ; Mon, 1 Feb 2010 05:04:52 -0800 (PST) Received: by mail.ffwll.ch (Postfix, from userid 1000) id 692E020C1B6; Mon, 1 Feb 2010 14:04:51 +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-+--signedoffby X-Spam-Status: No, score=-1.2 required=6.0 tests=ALL_TRUSTED,BAYES_00, FH_DATE_PAST_20XX autolearn=no version=3.2.5 X-Spam-Spammy: 0.969-+--H*m:ffwll, 0.965-+--H*Ad:U*daniel.vetter, 0.954-+--H*r:mail.ffwll.ch Received: from biene (unknown [192.168.23.129]) by mail.ffwll.ch (Postfix) with ESMTP id 126EB20C1B6; Mon, 1 Feb 2010 14:04:42 +0100 (CET) Received: from daniel by biene with local (Exim 4.71) (envelope-from ) id 1NbvsM-00026t-TR; Mon, 01 Feb 2010 13:59:34 +0100 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Mon, 1 Feb 2010 13:59:24 +0100 Message-Id: <9b12cedfc8da87a386fa95819ee73aa79b56a44b.1265028983.git.daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <2d1d0aa645b8826498258b4a945598ab649e6a39.1265028983.git.daniel.vetter@ffwll.ch> References: <10bf8c49d793b2c3055ec6159fb53afd5d688c87.1265028983.git.daniel.vetter@ffwll.ch> <1264b12229d1821821a5f9a1a79828bf7f12de24.1265028983.git.daniel.vetter@ffwll.ch> <9251de0a8ec96b2cf4cf7106d97c3b41f98f0770.1265028983.git.daniel.vetter@ffwll.ch> <37c87feb08470fea8d5e062f82bbddeaef0bf47f.1265028983.git.daniel.vetter@ffwll.ch> <2d1d0aa645b8826498258b4a945598ab649e6a39.1265028983.git.daniel.vetter@ffwll.ch> In-Reply-To: References: Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 09/11] 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]); Mon, 01 Feb 2010 13:05:35 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index b154f63..7c4a7d9 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2745,7 +2745,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) @@ -2754,9 +2753,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,