From patchwork Mon Nov 23 09:32:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7678591 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 024629F750 for ; Mon, 23 Nov 2015 09:33:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3EA172062C for ; Mon, 23 Nov 2015 09:33:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 756F32061D for ; Mon, 23 Nov 2015 09:33:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BF02B72037; Mon, 23 Nov 2015 01:33:19 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by gabe.freedesktop.org (Postfix) with ESMTPS id 35EE66E497 for ; Mon, 23 Nov 2015 01:33:16 -0800 (PST) Received: by wmec201 with SMTP id c201so151025268wme.0 for ; Mon, 23 Nov 2015 01:33:14 -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=OxJLyT9v8zHc8Ns7ujEmL0J/JmQLS0u2sBPsbArm88c=; b=deZ/QmBV5sTHB16uwwOgrwmIRIyXQ1c6UAbv5pC77shFVw5uBw2Dv8q1X6ADjU0bka X9MeKD20h6ZEJsaZhnqh3xE8RGg92rGfnneh346vnlgmtemm+pw25NjJ2hBz3IdO7c3C MhDEIMjeUI8EXCQAriA/VKXSsAJ8FZXhFxNlk= 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=OxJLyT9v8zHc8Ns7ujEmL0J/JmQLS0u2sBPsbArm88c=; b=NNs2mFLNBzLYP38vfgzovGzuYMgqvjwuSAY7SDiJJJ4M8jzw8JHAQ41Fzw5Tg6P/l5 4xbkjPJ4iCSAdUIyhZ8ClbB63ScLM+tgsP4RoJHdfGZzi7T6anydCwkQ8az3XpHeFnnI IAgT5sMF1Iaa92RkRHcvvsPX0mgozOB+Kzx9o59aNoBxoVkgmNUtEfxYEmMImLT6O1hy Y4bugHLmK7FhXKgX1OmRkWATJ/DHH4XX+L6OHYEYNfVjB/3076mQDqLc1i/E6785K2Ij 47PFxgm2Vpo+APGbXn5Vs1YysoT2Ue/ZsPGcThflnAH18g9y3nB184v5Sc2fzsvdT4Us /gcw== X-Gm-Message-State: ALoCoQn6QHKneDru6QGtcqdNwW0t1IGEX69pUdamKDA6aVFsQmqcfpfIEmYLVIfSbBC7UT76TtR1 X-Received: by 10.28.184.13 with SMTP id i13mr14127796wmf.31.1448271194867; Mon, 23 Nov 2015 01:33:14 -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.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 01:33:14 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 02/29] drm/nouveau: Use unlocked gem unreferencing Date: Mon, 23 Nov 2015 10:32:35 +0100 Message-Id: <1448271183-20523-3-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 , Ben Skeggs , 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: Ben Skeggs Signed-off-by: Daniel Vetter --- drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index 025504911b39..62633b110d70 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -295,7 +295,7 @@ nouveau_user_framebuffer_create(struct drm_device *dev, err: kfree(nouveau_fb); err_unref: - drm_gem_object_unreference(gem); + drm_gem_object_unreference_unlocked(gem); return ERR_PTR(ret); }