From patchwork Fri Jan 15 12:24:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 73158 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0FCOZrK003355 for ; Fri, 15 Jan 2010 12:24:35 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 59C429F4F3; Fri, 15 Jan 2010 04:24:35 -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 ABD7E9F4BB for ; Fri, 15 Jan 2010 04:24:26 -0800 (PST) Received: by mail.ffwll.ch (Postfix, from userid 1000) id 45BE220C224; Fri, 15 Jan 2010 13:24:25 +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-+--signedoffby, 0.000-+--signed-off-by X-Spam-Status: No, score=-1.2 required=6.0 tests=ALL_TRUSTED,AWL,BAYES_00, FH_DATE_PAST_20XX autolearn=no version=3.2.5 X-Spam-Spammy: 0.967-+--H*m:ffwll, 0.964-+--H*Ad:U*daniel.vetter, 0.953-+--H*r:mail.ffwll.ch Received: from biene (unknown [192.168.23.129]) by mail.ffwll.ch (Postfix) with ESMTP id 4EAA220C225; Fri, 15 Jan 2010 13:23:56 +0100 (CET) Received: from daniel by biene with local (Exim 4.71) (envelope-from ) id 1NVlE3-0003hY-EO; Fri, 15 Jan 2010 13:24:27 +0100 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Fri, 15 Jan 2010 13:24:17 +0100 Message-Id: <13403acaf4bc67e4bd0dd317dbaef25ed7324050.1263558064.git.daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.6.6 In-Reply-To: <929126816da9516827b8850d4c0c4dcd08cf3587.1263558064.git.daniel.vetter@ffwll.ch> References: <74471ded981086a7e563554dd9d0ea490fb31a88.1263558064.git.daniel.vetter@ffwll.ch> <102f9fb63e13a34928c5fd4c1c42f2c578357d65.1263558064.git.daniel.vetter@ffwll.ch> <696000111f936935bff77e578594e1adbadd4811.1263558064.git.daniel.vetter@ffwll.ch> <4b6704aae352dc67313813a3aff309a51c84d8e8.1263558064.git.daniel.vetter@ffwll.ch> <218f84ba918f387762e080160db19fbf90b63462.1263558064.git.daniel.vetter@ffwll.ch> <929126816da9516827b8850d4c0c4dcd08cf3587.1263558064.git.daniel.vetter@ffwll.ch> In-Reply-To: References: Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 10/11] drm/i915: ensure lru ordering of fence_list 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 diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 23fae9a..b11cd68 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1576,6 +1576,36 @@ i915_gem_object_move_to_inactive(struct drm_gem_object *obj) i915_verify_inactive(dev, __FILE__, __LINE__); } +static void +i915_gem_process_flushing_list(struct drm_device *dev, + uint32_t flush_domains, uint32_t seqno) +{ + drm_i915_private_t *dev_priv = dev->dev_private; + struct drm_i915_gem_object *obj_priv, *next; + + list_for_each_entry_safe(obj_priv, next, + &dev_priv->mm.flushing_list, list) { + struct drm_gem_object *obj = obj_priv->obj; + + if ((obj->write_domain & flush_domains) == + obj->write_domain) { + uint32_t old_write_domain = obj->write_domain; + + obj->write_domain = 0; + i915_gem_object_move_to_active(obj, seqno); + + /* update the fence lru list */ + if (obj_priv->fence_reg != I915_FENCE_REG_NONE) + list_move_tail(&obj_priv->fence_list, + &dev_priv->mm.fence_list); + + trace_i915_gem_object_change_domain(obj, + obj->read_domains, + old_write_domain); + } + } +} + /** * Creates a new sequence number, emitting a write of it to the status page * plus an interrupt, which will trigger i915_user_interrupt_handler. @@ -1634,27 +1664,8 @@ i915_add_request(struct drm_device *dev, struct drm_file *file_priv, /* Associate any objects on the flushing list matching the write * domain we're flushing with our flush. */ - if (flush_domains != 0) { - struct drm_i915_gem_object *obj_priv, *next; - - list_for_each_entry_safe(obj_priv, next, - &dev_priv->mm.flushing_list, list) { - struct drm_gem_object *obj = obj_priv->obj; - - if ((obj->write_domain & flush_domains) == - obj->write_domain) { - uint32_t old_write_domain = obj->write_domain; - - obj->write_domain = 0; - i915_gem_object_move_to_active(obj, seqno); - - trace_i915_gem_object_change_domain(obj, - obj->read_domains, - old_write_domain); - } - } - - } + if (flush_domains != 0) + i915_gem_process_flushing_list(dev, flush_domains, seqno); if (!dev_priv->mm.suspended) { mod_timer(&dev_priv->hangcheck_timer, jiffies + DRM_I915_HANGCHECK_PERIOD);