From patchwork Wed Oct 21 08:06:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7454871 Return-Path: X-Original-To: patchwork-intel-gfx@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 22F12BEEA4 for ; Wed, 21 Oct 2015 08:06:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 14D4A20842 for ; Wed, 21 Oct 2015 08:06:45 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5F7F920840 for ; Wed, 21 Oct 2015 08:06:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C829E6ED31; Wed, 21 Oct 2015 01:06:39 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by gabe.freedesktop.org (Postfix) with ESMTPS id 538066ED31 for ; Wed, 21 Oct 2015 01:06:38 -0700 (PDT) Received: by wijp11 with SMTP id p11so82213100wij.0 for ; Wed, 21 Oct 2015 01:06:37 -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; bh=TBopukVQ913diMxPELsFhrW5gS9c88HgDA5YTAbF8Ro=; b=itXJkGOTzkrieZbkSTHS5/Ifob9d5jlNIbXsbMMPbj13W445uluW1/xqVhQ7Lr3vS9 iYYqxcyurDYgFcv0nS+v5T+GxQo7JyTTmSpve8OfaodRu2ZoscfJWGL1iS2evR5aIp5D uEVERM4U1Rmss3Uc2Ntt/gn6VBPEo4jQzhi2Y= 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; bh=TBopukVQ913diMxPELsFhrW5gS9c88HgDA5YTAbF8Ro=; b=EFYx5CN8YacICwx1irxwdepkuv341ToH0In2HRXen9lv3s+Y4ytaCLSOzBw8RzffxI Cg7zI7i93eQUw/igNQc/GQjtuYY0S5qVl2fGnPEszuPZKSqoIUBlN3xONRiB6yNOBhsB fNySdz5R9vobgG1aNLVqc0+JU75Itv9ubfiVbLfqtKk9L5VDN1gAwMb9gEfI70fboGzI eTSE90tzJyDIkfg0Atj87urtkh3zaAP2+v9gzjW1LWGHyH1AYMRXlNZEHxMEeIQ8+BUi YaC49NbdKXvZ2MGLwoQSVMbiAmMds0/sHxG/oGmqsJtgdMvJ4J0ono/+Wr0xj61H+tXb j7eQ== X-Gm-Message-State: ALoCoQnAcCG2tNLboeJchu+hoCzbDcj4MluJoA3tMs0Bkvh4vCLIVC7qHwJ6Xg1JFkGdk0lQimcY X-Received: by 10.194.157.102 with SMTP id wl6mr10139735wjb.79.1445414797104; Wed, 21 Oct 2015 01:06:37 -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 lv4sm8700738wjb.43.2015.10.21.01.06.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Oct 2015 01:06:36 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 21 Oct 2015 10:06:31 +0200 Message-Id: <1445414791-20977-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 Cc: Daniel Vetter , Thierry Reding , Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/tegra: Use drm_gem_object_reference_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.1 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! Cc: Thierry Reding Signed-off-by: Daniel Vetter --- 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 fb712316c522..1146fbe523d5 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; }