From patchwork Thu Nov 19 16:46:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7659141 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 A25DC9FDE1 for ; Thu, 19 Nov 2015 16:47:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BF87520658 for ; Thu, 19 Nov 2015 16:47:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CAD9620667 for ; Thu, 19 Nov 2015 16:47:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD97D7A168; Thu, 19 Nov 2015 08:47:08 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by gabe.freedesktop.org (Postfix) with ESMTPS id 896027A161 for ; Thu, 19 Nov 2015 08:47:05 -0800 (PST) Received: by wmww144 with SMTP id w144so124715062wmw.0 for ; Thu, 19 Nov 2015 08:47:04 -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=7TDmHWx4//zR7YriqjkX8uRybf3YBWJUiuZc6CG4bIc=; b=iSq3xIWOYM3W2Il/lzHfUDr6xoIstQTdsegKY8RivO/VlT0cJVyCAuuhemEfUNcxBF HkMDno5HxfAiFDZn08/qhpoWRb1aL7kcM2EUvdvB5gYVTtM5p4+XjYKlUA2ya3V45XtK kmkywEPMWpZir0MLjCgYTzKm4KWIo813S0j2E= 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=7TDmHWx4//zR7YriqjkX8uRybf3YBWJUiuZc6CG4bIc=; b=LYxgIvXwJcMFlLqNf5dz4PiAbg2wtrmTZ5g2n2yjfssH4c8OdezHJ/JKUqxxiLV8P7 G4fxsNEPjTjHs6onIDNFC8GMifdOtb/4HER3pmhIbjwum/NXSBZQzGx6aiDIk316OHod x+8MhL5adJngtUOQNaFp5Ij1puFS4aqu6z5L1p5a+YshJN9O/X0GjBPd6UzHABQDR+gk 9lboFBng5o/wtGvR/9tISQY1BUFPG95OxVcxk9Neqp0BxYasZXY64BPqDLCn2iw8lGCB IhdU1RMad3YLRAgCJnQqYcQqjY9NljzOCxX5LVr0sB1U7DNgWBR0IUcGpKKmdI0TJu50 iq1g== X-Gm-Message-State: ALoCoQmNie841wII/yjvPIzKyBlQsLtfHC2kXBlCOcjafYPmC1Izrm33EzGB1uTyGRfj4SBpy2Ut X-Received: by 10.28.3.131 with SMTP id 125mr5773616wmd.64.1447951624306; Thu, 19 Nov 2015 08:47:04 -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 cv3sm8695001wjc.20.2015.11.19.08.47.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Nov 2015 08:47:03 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH RESEND 06/20] drm/tegra: Use drm_gem_object_unreference_unlocked Date: Thu, 19 Nov 2015 17:46:35 +0100 Message-Id: <1447951610-12622-7-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1447951610-12622-1-git-send-email-daniel.vetter@ffwll.ch> References: <1447951610-12622-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , 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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.6 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 e0f827790a5e..41f4efef777b 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; }