From patchwork Fri Feb 19 10:51:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 80606 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 o1JAqFst030620 for ; Fri, 19 Feb 2010 10:52:50 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 32C1AA0905; Fri, 19 Feb 2010 02:52:15 -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 D58D2A08F7 for ; Fri, 19 Feb 2010 02:52:11 -0800 (PST) Received: by mail.ffwll.ch (Postfix, from userid 1000) id BBDEB20C235; Fri, 19 Feb 2010 11:52:10 +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.972-+--H*m:ffwll, 0.965-+--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 7889E20C22C; Fri, 19 Feb 2010 11:51:55 +0100 (CET) Received: from daniel by biene with local (Exim 4.71) (envelope-from ) id 1NiQSx-0001KR-67; Fri, 19 Feb 2010 11:52:11 +0100 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Fri, 19 Feb 2010 11:51:57 +0100 Message-Id: X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <4cf8f7abd804d3b17122614b604fdb919d34e0aa.1266569618.git.daniel.vetter@ffwll.ch> References: <76a6bb81cf7bed8c4822d3874ddfab0ca0bd54db.1266569618.git.daniel.vetter@ffwll.ch> <4cf8f7abd804d3b17122614b604fdb919d34e0aa.1266569618.git.daniel.vetter@ffwll.ch> In-Reply-To: References: Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 4/9] drm/i915: fixup active list locking in object_unbind 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:52:51 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 7d36a39..609aec1 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1991,6 +1991,7 @@ int i915_gem_object_unbind(struct drm_gem_object *obj) { struct drm_device *dev = obj->dev; + drm_i915_private_t *dev_priv = dev->dev_private; struct drm_i915_gem_object *obj_priv = obj->driver_private; int ret = 0; @@ -2046,8 +2047,10 @@ i915_gem_object_unbind(struct drm_gem_object *obj) } /* Remove ourselves from the LRU list if present. */ + spin_lock(&dev_priv->mm.active_list_lock); if (!list_empty(&obj_priv->list)) list_del_init(&obj_priv->list); + spin_unlock(&dev_priv->mm.active_list_lock); if (i915_gem_object_is_purgeable(obj_priv)) i915_gem_object_truncate(obj);