From patchwork Mon Nov 23 09:32:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7678791 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 26011BF90C for ; Mon, 23 Nov 2015 09:33:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2D2C120670 for ; Mon, 23 Nov 2015 09:33:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5578820630 for ; Mon, 23 Nov 2015 09:33:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 602F9720EF; Mon, 23 Nov 2015 01:33:31 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by gabe.freedesktop.org (Postfix) with ESMTPS id 56CFE720E6 for ; Mon, 23 Nov 2015 01:33:28 -0800 (PST) Received: by wmec201 with SMTP id c201so151033206wme.0 for ; Mon, 23 Nov 2015 01:33:27 -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=6XZQuZPo29yeaPLaNoxDA2xNZodu4jiAeMNMKdRmauQ=; b=RmM9Z39Y1zOadYxgBK+T+DEhfbOsSHU3UlenRsgzl7evy6WowAKzLC4xRNvu3TS0DZ UVsBx7iOyznurJ3SN1XGHp0DOOIcNpqCO2Srs/YucHzQhdT3b0NguN0PmuRByQZ8bz70 nJQcG4ULni/n3yvE2dQRoqnlusbWIp9wlhhzM= 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=6XZQuZPo29yeaPLaNoxDA2xNZodu4jiAeMNMKdRmauQ=; b=JC7FbKZg5LGVZLs0IckM1Gy67tc6SETB2OAUK6P0+U+O9zcJz57h3Pn/2W4nqsjHo0 QZSP4X2n2ju4FmnXwG6AuhGfeDstQbiyC5Y9GcM/T8M35Y0+6Ehsg90bK8u0kYZJq525 RqLYbzyS+ABFTln6LtQ8YpNvtfR4VfJD5RvEYpOSmOdssdcU07d3dnzZDapN21/qm+Ob t6YeDy8yS1r9rgQVf+tTWAyEvncugSkLZDQBvE4BdSgSN0+UfpmaYRcjZl+XF9AYjZoy hJcTqBh2jrZ/EBNk9zt0ehyqDcfP8FV+03zGTGimjch2k0zI4Ptgm6lU72l4VtJFfRaT Ar5A== X-Gm-Message-State: ALoCoQllXGecSpZ7zwCZ7gDKNCdH9l4gkhLworXFcC7l1xzCUVdYn0i3fu3P8l5B7fkg8pG9oj7s X-Received: by 10.28.189.5 with SMTP id n5mr18357471wmf.76.1448271207103; Mon, 23 Nov 2015 01:33:27 -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 pn6sm12332758wjb.15.2015.11.23.01.33.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 01:33:26 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 14/29] drm/tegra: don't take dev->struct_mutex in mmap offset ioctl Date: Mon, 23 Nov 2015 10:32:47 +0100 Message-Id: <1448271183-20523-15-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1448271183-20523-1-git-send-email-daniel.vetter@ffwll.ch> References: <1448271183-20523-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.7 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 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 Acked-by: Thierry Reding Reviewed-by: Patrik Jakobsson Signed-off-by: Daniel Vetter --- 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; }