From patchwork Thu Oct 15 07:36:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7403491 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E9007BF90C for ; Thu, 15 Oct 2015 07:34:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1FC2220854 for ; Thu, 15 Oct 2015 07:34:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C663D207C6 for ; Thu, 15 Oct 2015 07:34:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C39647A098; Thu, 15 Oct 2015 00:34:04 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by gabe.freedesktop.org (Postfix) with ESMTPS id 576A87A0C5 for ; Thu, 15 Oct 2015 00:33:57 -0700 (PDT) Received: by wicgb1 with SMTP id gb1so15372092wic.1 for ; Thu, 15 Oct 2015 00:33:56 -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; bh=4dhpuIwwPbO31vDAX+gejYd29LqpXRf6TjG29f0s8xQ=; b=CVcej77zvqkr2NxxWzHh+gkaRlshqy7TxRBp5XHe6LL9KSb/xJGh+n9jnCsLB1ICTO HOFi3a6Siv4FsNUZf+yzmbEXoifA4hTHv4PDkawqDuTtL1lFevdYirBUxOEX90eSrhM1 yZWp7weiAbthF1W9vX9jH90JnC5kL9S00H0QE= 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=4dhpuIwwPbO31vDAX+gejYd29LqpXRf6TjG29f0s8xQ=; b=KF3zgTPfgtCHjzm0lSzEcxjbPunBbIhGVF00IPwSPek0GGySDKOwhDIIWtknxncPIt Mk/6Bnr7wge+D+lDQEWOJ/4ZOitJi5qxS5kXGW7jE14erLK9a23kPKgM0OU1BylFkPIg 62Baa8UC/3teKqnmq2UKmRdoofzZb8u0VWYi0g71aS3o4G2z7R4KL9Ht+huYVR5KfUcx 9WSWh3I6tOm8SIhoGn75Lr1T2uDuLrCZLGp7zaWQlSRaAc4Z3WUhLwwQgjqmhy0XybAk keMlN8oBpWW+OcX84lq3Flui3QwENu8ds9MAjAlakqHPbfJKCv3bNqvaZAzat02YYSam f7Jw== X-Gm-Message-State: ALoCoQnuu/sUOWBWQWvWSwNoAi3GmLFzcUVWXbQiguYwXlCzTOZnS/zPiEiLj/VSdkv+f7D53LwU X-Received: by 10.180.189.41 with SMTP id gf9mr8387557wic.95.1444894436072; Thu, 15 Oct 2015 00:33:56 -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 z4sm10201014wjz.29.2015.10.15.00.33.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Oct 2015 00:33:55 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 06/25] drm/tegra: Use drm_gem_object_reference_unlocked Date: Thu, 15 Oct 2015 09:36:22 +0200 Message-Id: <1444894601-5200-7-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1444894601-5200-1-git-send-email-daniel.vetter@ffwll.ch> References: <1444894601-5200-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , 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.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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! Cc: Thierry Reding Signed-off-by: Daniel Vetter Acked-by: Thierry Reding --- drivers/gpu/drm/tegra/drm.c | 4 +--- drivers/gpu/drm/tegra/gem.c | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 159ef515cab1..5de9a4ead463 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 827838e64d6e..a946259495e1 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); + drm_gem_object_reference_unlocked(&obj->gem); return bo; }