From patchwork Mon Nov 23 09:32:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7678671 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 F36CDC05CC for ; Mon, 23 Nov 2015 09:33:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0890620445 for ; Mon, 23 Nov 2015 09:33:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 196382062F for ; Mon, 23 Nov 2015 09:33:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 14E79720CD; Mon, 23 Nov 2015 01:33:22 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4AF59720D5 for ; Mon, 23 Nov 2015 01:33:21 -0800 (PST) Received: by wmec201 with SMTP id c201so151028548wme.0 for ; Mon, 23 Nov 2015 01:33:20 -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=ZDQ9kkDYMRlDauMQFTmSGOhUbfkGekx0Lrhvq2YLc7M=; b=O0HOOabkYk2pAy4iwks0Pd75j9yNs+FYL7GAO8nA+M9ggKSKCfhi67EbE2wB2kZReB HE6QBjocLw4eCqhV0XbcbJzwqUYkV+mYmGaZTbbIgFVKMSbnBdL0Ee53yrDLlecEn1AV +vMwlbqCoNrvt52l/NjK9U2UNHWhoSA3yYsZs= 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=ZDQ9kkDYMRlDauMQFTmSGOhUbfkGekx0Lrhvq2YLc7M=; b=UqvrAZ8WEEWontrb70OY0CPWzzyEN/EPMAwxxrTn2455fV0yPpRB7v+BItWB3rN0ZY p+dxCJcPTY41Z5E8A1MlrW0JuOKBpidx6PbO0BadkURYcCwymEbP9HehBWDJVsWWWtni wjn6PjcBLhR+tVGc1LrpNUg3x9CHotbR35jAW2SOnqU0Y8b4kf4AdM1WQR1OLFTQGWDc sk0rFySUR7f/JmACtd5vkwaWsijpx012cwORugU6OUEfPRIRd1efy07qq6XwGT1ebZTB 2CibaiY23SEWYma/RNu9/GK1LxBAE/UGarg0mJZCv0rkhC5uWU4DBeKRP5rl2ekc4JG4 +3jQ== X-Gm-Message-State: ALoCoQlZ2b/VIXOdWxgUB99WWDr1EFgWXF6Xb8OfSeGVDtW0By85iZAEiAtfCTsX1GX1e4JjjQBA X-Received: by 10.194.109.169 with SMTP id ht9mr5807955wjb.13.1448271200012; Mon, 23 Nov 2015 01:33:20 -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.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 01:33:19 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 07/29] drm/tegra: Use unlocked gem unreferencing Date: Mon, 23 Nov 2015 10:32:40 +0100 Message-Id: <1448271183-20523-8-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 For drm_gem_object_unreference callers are required to hold dev->struct_mutex, which these paths don't. Enforcing this requirement has become a bit more strict with commit ef4c6270bf2867e2f8032e9614d1a8cfc6c71663 Author: Daniel Vetter Date: Thu Oct 15 09:36:25 2015 +0200 drm/gem: Check locking in drm_gem_object_unreference Cc: Thierry Reding Signed-off-by: Daniel Vetter --- drivers/gpu/drm/tegra/drm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index e0f827790a5e..3479c57151af 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -473,7 +473,7 @@ static int tegra_gem_mmap(struct drm_device *drm, void *data, args->offset = drm_vma_node_offset_addr(&bo->gem.vma_node); - drm_gem_object_unreference(gem); + drm_gem_object_unreference_unlocked(gem); return 0; } @@ -683,7 +683,7 @@ static int tegra_gem_set_tiling(struct drm_device *drm, void *data, bo->tiling.mode = mode; bo->tiling.value = value; - drm_gem_object_unreference(gem); + drm_gem_object_unreference_unlocked(gem); return 0; } @@ -723,7 +723,7 @@ static int tegra_gem_get_tiling(struct drm_device *drm, void *data, break; } - drm_gem_object_unreference(gem); + drm_gem_object_unreference_unlocked(gem); return err; } @@ -748,7 +748,7 @@ static int tegra_gem_set_flags(struct drm_device *drm, void *data, if (args->flags & DRM_TEGRA_GEM_BOTTOM_UP) bo->flags |= TEGRA_BO_BOTTOM_UP; - drm_gem_object_unreference(gem); + drm_gem_object_unreference_unlocked(gem); return 0; } @@ -770,7 +770,7 @@ static int tegra_gem_get_flags(struct drm_device *drm, void *data, if (bo->flags & TEGRA_BO_BOTTOM_UP) args->flags |= DRM_TEGRA_GEM_BOTTOM_UP; - drm_gem_object_unreference(gem); + drm_gem_object_unreference_unlocked(gem); return 0; }