From patchwork Thu Oct 15 07:36:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7403431 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 B65FFBEEA4 for ; Thu, 15 Oct 2015 07:34:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CF2F620851 for ; Thu, 15 Oct 2015 07:33:59 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B360B20786 for ; Thu, 15 Oct 2015 07:33:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DAA8D7A095; Thu, 15 Oct 2015 00:33:57 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by gabe.freedesktop.org (Postfix) with ESMTPS id 574357A095 for ; Thu, 15 Oct 2015 00:33:56 -0700 (PDT) Received: by wicll6 with SMTP id ll6so27557276wic.0 for ; Thu, 15 Oct 2015 00:33:55 -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=bUCM62T47mFZn7c1iId16r/7SDGIgcRCMwiUY66lXyw=; b=HafSgtVjjSnvYiq5A0rmucP5B/SrMa6vU6kqRlrd3cLrePsw/heEdD8R/OdLWdPz2f Dshvl23wkFCLPune+FHGguTOjdgzYnatb7QZy28aGccjkQh8v94R1o0eJpSmT5cGrbEC 2nfHbS9pFoDbslYPd8Ecf+BKolJwgK1zQhI0c= 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=bUCM62T47mFZn7c1iId16r/7SDGIgcRCMwiUY66lXyw=; b=D2BcQ969SujA+nzBVCFKAo5G7LqrGQVYa7w1nOWCcx8DE66DQcHt7UykHlCur8DFtT CCrCbslzJOYroOS3vC6xzItWRIRJkW5X7h3dnIhRP5nhDbseUpS68vVqjBCO3hwsE6Rk VUJyiSVX7JFN/ixJ08pc8Vacq5NWd5OkGzOTIwsNtCxfQ5mikQ+Wt3WXZ47CtBV5FqOH fOOz3ikwUJwLWzj+HtAHCcTrUV0djjwQM0BWNQ2t6XA9rbW5mH4GvlzQRq9J4wqpQGkh g2nmzsKYo53h91fwTGOcqKvJzWgvgK6K3oHlX61SwYjwIIgg+/QA27BhxlqfFx/Tg0YF 6Fyg== X-Gm-Message-State: ALoCoQmQvgVfj1jcKOA3aCvBFzdY6ki02I9yTZzpJQaVsLLX+Ma8dBjPdCo2vUSjDwB1UCUq24CQ X-Received: by 10.180.87.102 with SMTP id w6mr9557970wiz.88.1444894435114; Thu, 15 Oct 2015 00:33:55 -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.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Oct 2015 00:33:54 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 05/25] drm/tegra: don't take dev->struct_mutex in mmap offset ioctl Date: Thu, 15 Oct 2015 09:36:21 +0200 Message-Id: <1444894601-5200-6-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 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). While at it also fix a leak when this ioctl is called on an imported buffer. Cc: Thierry Reding Signed-off-by: Daniel Vetter --- drivers/gpu/drm/tegra/gem.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 01e16e146bfe..827838e64d6e 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; } @@ -423,8 +420,6 @@ int tegra_bo_dumb_map_offset(struct drm_file *file, struct drm_device *drm, drm_gem_object_unreference(gem); - mutex_unlock(&drm->struct_mutex); - return 0; }