From patchwork Thu Oct 15 12:35:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7405851 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 D40069F1D5 for ; Thu, 15 Oct 2015 12:32:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 00C2D20875 for ; Thu, 15 Oct 2015 12:32:19 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2AA202084F for ; Thu, 15 Oct 2015 12:32:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 49FDD72094; Thu, 15 Oct 2015 05:32:17 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTPS id 297C772094 for ; Thu, 15 Oct 2015 05:32:16 -0700 (PDT) Received: by wijp11 with SMTP id p11so27278979wij.0 for ; Thu, 15 Oct 2015 05:32:14 -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=wRy0JJnIXWEa45Vkw4WZJ4JpXJQZAoVYIHj6Oz0eGBI=; b=KIeAh5tMdaK0G5fJapuOXZpYamJTGMSR7wYupNyAHK2ib/jWevt8s/XHh/VnhJZ/y+ gyB33g0cb2dFocSYd/7VwjllrHdqSebcRcoyxuxxD2wLK1NqEs7dNvou2YP9F+FtCWWJ GF0DDt/kpvo2v5BDtKkmvZ+j1QsqwdQTN2xYQ= 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=wRy0JJnIXWEa45Vkw4WZJ4JpXJQZAoVYIHj6Oz0eGBI=; b=gkpxqRbBVN4OtHZTE54eNUlpl3E9L8UtYTrp4axBDe2XL+S3XSPawZ9tpCUuhYVL5J jp1HtEvSXggor+d1HTgmH3+T05RxynH0nekjfG5DCe2wOCmSTd1fxsT1BjEoa5P8oBPH MTLo5ie4UPyryNsFZDDmzG0E73SDrjPj2DLGbmGbDuQ7zTKaslo6tSsyG5k1F7FL6qay rV5qK/gkyHW44FkL2u6ZroCeLY0uRS00l9tHfGjXFcuYukP6/DPbb3XAAgOVRQzckwhN 0Y1mn2PxQ5j60S4FPlJ00TUnvvhGETYW30zHllRuY70ZtEgnV28wqZl0rTEOOVClOa5p OQog== X-Gm-Message-State: ALoCoQlnf6qV0ZP4VatwW2NP5Azu3ZOSSc8fp1DRw7ndFh3+z+2+YystG3B8CIRU7DoKzRfkPaDI X-Received: by 10.194.246.42 with SMTP id xt10mr10389624wjc.11.1444912334448; Thu, 15 Oct 2015 05:32:14 -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 i10sm16230357wjz.41.2015.10.15.05.32.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Oct 2015 05:32:13 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/tegra: don't take dev->struct_mutex in mmap offset ioctl Date: Thu, 15 Oct 2015 14:35:04 +0200 Message-Id: <1444912504-13581-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1444894601-5200-6-git-send-email-daniel.vetter@ffwll.ch> References: <1444894601-5200-6-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 Since David Herrmann's mmap vma manager rework we don't need to grab dev->struct_mutex any more to prevent races when looking up the mmap offset. Drop it and instead don't forget to use the unref_unlocked variant (since the drm core still cares). v2: Finally get rid of the copypasta from another commit in this commit message. And convert to _unlocked like we need to (Patrik). Cc: Patrik Jakobsson Cc: Thierry Reding Signed-off-by: Daniel Vetter Reviewed-by: Patrik Jakobsson Acked-by: Thierry Reding --- drivers/gpu/drm/tegra/gem.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 01e16e146bfe..fb712316c522 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -408,12 +408,9 @@ int tegra_bo_dumb_map_offset(struct drm_file *file, struct drm_device *drm, struct drm_gem_object *gem; struct tegra_bo *bo; - mutex_lock(&drm->struct_mutex); - gem = drm_gem_object_lookup(drm, file, handle); if (!gem) { dev_err(drm->dev, "failed to lookup GEM object\n"); - mutex_unlock(&drm->struct_mutex); return -EINVAL; } @@ -421,9 +418,7 @@ int tegra_bo_dumb_map_offset(struct drm_file *file, struct drm_device *drm, *offset = drm_vma_node_offset_addr(&bo->gem.vma_node); - drm_gem_object_unreference(gem); - - mutex_unlock(&drm->struct_mutex); + drm_gem_object_unreference_unlocked(gem); return 0; }