From patchwork Thu Jul 9 21:32:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6760041 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 029B49F319 for ; Thu, 9 Jul 2015 21:30:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 22B3420792 for ; Thu, 9 Jul 2015 21:30:40 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 25CFC2078F for ; Thu, 9 Jul 2015 21:30:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 79BB57A09A; Thu, 9 Jul 2015 14:30:38 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by gabe.freedesktop.org (Postfix) with ESMTPS id C69F87A095 for ; Thu, 9 Jul 2015 14:30:36 -0700 (PDT) Received: by wgck11 with SMTP id k11so234291852wgc.0 for ; Thu, 09 Jul 2015 14:30:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=LZhrPxi+ybVjZtMbIpNSjfbf+RP0aDxz0PFo2Dgmifo=; b=U1Hu8/UYWcfhmLCTZ3XgOZS9KSIA0b/crai+2N79tyfouC8Mu4nJ4rGjvZwb1VO2bt xRmaiZ8WwbUE6DFW0q30ekjO3RoBxAMzU23EEHL6GF+YTsJ5FqBX4C+Xd3oBub7zAj8a LVn9sSh1npQ8PyPmBzesohltKcWoCvaMiGxZk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=LZhrPxi+ybVjZtMbIpNSjfbf+RP0aDxz0PFo2Dgmifo=; b=TRbYOBRVcZ9GIyb3oXqukdSNuO59EK9vqsPwdprT34kLA6OHnT/KvO8xk+c+BOCQ4H LL71Rsa5uMznvIqmY+VdHEJisgyb1yKHHSk+ydwv+RjoCr/wY64q4e84jJC2xGlnEzzv EbOFxVbih37jL+CKtY2xgdZ2GywLe+jXhEFd744HWGldw+ZP1ycCcl720hjlPo1FK0K9 P/OtnjwHwqpfhlesoFYvFu6iLkXfpXhb6UNiilcoBuaT1PxBKDpmmoAYbgYwJ/IhbAN1 1Gc43y8wHIhcq+zBntnp/i0RbJVAabrVDWobYOn4xL1Bhtam4kmQe6XFSGFESQ0G4U7m zPEA== X-Gm-Message-State: ALoCoQknBaQ5KYAisive83q8jEic0bvd9VFz0zGIM72v8vxp4mJKp6OXIWU5ME69TPHuSRPk95c/ X-Received: by 10.194.57.170 with SMTP id j10mr33524380wjq.140.1436477435596; Thu, 09 Jul 2015 14:30:35 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id j6sm3004128wix.5.2015.07.09.14.30.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jul 2015 14:30:35 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 15/18] drm/radeon: Don't take dev->struct_mutex in bo_force_delete Date: Thu, 9 Jul 2015 23:32:47 +0200 Message-Id: <1436477570-4936-16-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436477570-4936-1-git-send-email-daniel.vetter@ffwll.ch> References: <1436477570-4936-1-git-send-email-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Cc: Alex Deucher , Daniel Vetter , Intel Graphics Development , =?UTF-8?q?Christian=20K=C3=B6nig?= , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It really doesn't protect anything which doesn't have other locks already. Also this is run from driver unload code so not much need for locks anyway. Cc: Alex Deucher Cc: "Christian König" Signed-off-by: Daniel Vetter Reviewed-by: Thierry Reding --- drivers/gpu/drm/radeon/radeon_object.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 318165d4855c..3aefcb25d953 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -420,7 +420,6 @@ void radeon_bo_force_delete(struct radeon_device *rdev) } dev_err(rdev->dev, "Userspace still has active objects !\n"); list_for_each_entry_safe(bo, n, &rdev->gem.objects, list) { - mutex_lock(&rdev->ddev->struct_mutex); dev_err(rdev->dev, "%p %p %lu %lu force free\n", &bo->gem_base, bo, (unsigned long)bo->gem_base.size, *((unsigned long *)&bo->gem_base.refcount)); @@ -428,8 +427,7 @@ void radeon_bo_force_delete(struct radeon_device *rdev) list_del_init(&bo->list); mutex_unlock(&bo->rdev->gem.mutex); /* this should unref the ttm bo */ - drm_gem_object_unreference(&bo->gem_base); - mutex_unlock(&rdev->ddev->struct_mutex); + drm_gem_object_unreference_unlocked(&bo->gem_base); } }