From patchwork Mon Nov 23 09:32:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7679061 Return-Path: X-Original-To: patchwork-intel-gfx@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 CE5469FCAA for ; Mon, 23 Nov 2015 09:33:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EF4D12041F for ; Mon, 23 Nov 2015 09:33:54 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2E8AE20629 for ; Mon, 23 Nov 2015 09:33:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B64EF72106; Mon, 23 Nov 2015 01:33:47 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by gabe.freedesktop.org (Postfix) with ESMTPS id CCE32720E1 for ; Mon, 23 Nov 2015 01:33:29 -0800 (PST) Received: by wmww144 with SMTP id w144so96098791wmw.0 for ; Mon, 23 Nov 2015 01:33:28 -0800 (PST) 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; bh=/iItsJQ++1jtSActAEPtrR5cGq6FQEnWfEtw5KSVbdo=; b=UBoOTXkvk9rH1mNrceLuSo/3O6wW6RxSU8l7MN/uEufeqSz856POObzimpIc10zxrb SG5aSx81jY2Txye/RFxOG+YeaLV3XvJEr+IiJeIh7ax/O+5jpEzdL55EPWILpayQ0gpZ aEKetxxYPG8Ogow4FLAsbxdsUP4Xug8wd8nQE= 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; bh=/iItsJQ++1jtSActAEPtrR5cGq6FQEnWfEtw5KSVbdo=; b=e3ZQiR48JenhGCJeiT4KwwnYJv4YtJd7kW+9lTnRo9jMtyg7t10uu4LR7rRCxJKM9d H0pTobTlK8yqm+gLleFeceXpn92aTrL3aH3dt1BvEv79WDoiKM70rhALKyOOG2jDc5Ob A5VTmuDteyjgslAy6nIIin8Mmdl0nCg3nHV1Bq3aG+lgmZqrqqGXNUT0pWMl3Ifc5Jkh kx3h0859DEP3qxuyvhEEZz4B5z7rkmRk5MQehJtjalfIy/f+KXts24DOzqcu/zIeWWpY wZWqWjYnDfNODN4y9Wbw+6gzjxUhyddHwCq+vEaYI/E+MMGUzzbCgESL8VLRbRnHjQvR ew8A== X-Gm-Message-State: ALoCoQlPot5mEgRZ3ae4l+zMjGM+F65OZRI0bz920PK1xXzVFdqU6Cn9Yv8mXQrJZdYMa4eq3npd X-Received: by 10.28.222.4 with SMTP id v4mr15997064wmg.67.1448271208054; Mon, 23 Nov 2015 01:33:28 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id pn6sm12332758wjb.15.2015.11.23.01.33.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 01:33:27 -0800 (PST) From: Daniel Vetter To: DRI Development Date: Mon, 23 Nov 2015 10:32:48 +0100 Message-Id: <1448271183-20523-16-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1448271183-20523-1-git-send-email-daniel.vetter@ffwll.ch> References: <1448271183-20523-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Thierry Reding , Daniel Vetter Subject: [Intel-gfx] [PATCH 15/29] drm/tegra: Use drm_gem_object_unreference_unlocked X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 This only grabs the mutex when really needed, but still has a might-acquire lockdep check to make sure that's always possible. With this patch tegra is officially struct_mutex free, yay! v2: refernce_unlocked doesn't exist as kbuild spotted. Cc: Thierry Reding Acked-by: Thierry Reding Signed-off-by: Daniel Vetter --- drivers/gpu/drm/tegra/drm.c | 4 +--- drivers/gpu/drm/tegra/gem.c | 6 +----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 3479c57151af..34d067b677bd 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -277,9 +277,7 @@ host1x_bo_lookup(struct drm_device *drm, struct drm_file *file, u32 handle) if (!gem) return NULL; - mutex_lock(&drm->struct_mutex); - drm_gem_object_unreference(gem); - mutex_unlock(&drm->struct_mutex); + drm_gem_object_unreference_unlocked(gem); bo = to_tegra_bo(gem); return &bo->base; diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index fb712316c522..fbec29516bcb 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -30,9 +30,7 @@ static void tegra_bo_put(struct host1x_bo *bo) struct tegra_bo *obj = host1x_to_tegra_bo(bo); struct drm_device *drm = obj->gem.dev; - mutex_lock(&drm->struct_mutex); - drm_gem_object_unreference(&obj->gem); - mutex_unlock(&drm->struct_mutex); + drm_gem_object_unreference_unlocked(&obj->gem); } static dma_addr_t tegra_bo_pin(struct host1x_bo *bo, struct sg_table **sgt) @@ -74,9 +72,7 @@ static struct host1x_bo *tegra_bo_get(struct host1x_bo *bo) struct tegra_bo *obj = host1x_to_tegra_bo(bo); struct drm_device *drm = obj->gem.dev; - mutex_lock(&drm->struct_mutex); drm_gem_object_reference(&obj->gem); - mutex_unlock(&drm->struct_mutex); return bo; }