From patchwork Wed Mar 30 09:40:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8694341 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 0B0E3C0553 for ; Wed, 30 Mar 2016 09:41:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 376C920374 for ; Wed, 30 Mar 2016 09:41:20 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 56EBC20361 for ; Wed, 30 Mar 2016 09:41:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5EED46E73B; Wed, 30 Mar 2016 09:41:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x234.google.com (mail-wm0-x234.google.com [IPv6:2a00:1450:400c:c09::234]) by gabe.freedesktop.org (Postfix) with ESMTPS id 774826E739 for ; Wed, 30 Mar 2016 09:40:58 +0000 (UTC) Received: by mail-wm0-x234.google.com with SMTP id 20so62300821wmh.1 for ; Wed, 30 Mar 2016 02:40:58 -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=AB8/fbBvT0r89w+VgIeOM4eWfly9Q17Ei95CS6pvap4=; b=FeNzhbtinFI93imFxZzD4GO/n73MmFgAQJiXJu6vK6WpKBFU28oCO1Kv2EiqNhyeL+ Qt4lwJZWjfoq/5YG5RgN80rgKca05RqfK61PNu80QMYdYPovi1OSVCmoBy/YTVy8D4lm 6f23DGnelWDw6uWTMXUDyOnMlKbbSZ20s3jjk= 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=AB8/fbBvT0r89w+VgIeOM4eWfly9Q17Ei95CS6pvap4=; b=U6ikW2Mc/asNPNZ7TCzc6r1UrjfGcr6N8JFNyx0zFPris0XI65BTRgs7Qc9U59W+7S ZC4defI0EjHQSLZDtOPdlTgy4D+FhqGHZrijCySSMx2WBFpWG/5fRmpqTd/DSxLZ0oiJ YLcgZKpfSW2o8chgQjncI/aBVOn8C5/QEVYijJLb4Zx4/mSGzAFSZ2xIXLrYIxjXSYpT Z9+DIozeaCz/Xf0h/7hxtakN4Mc2dbvsfCh6w4nTyz4fZMQCo+9whnFRDqLVfzaNL09Q FaDue+5MyPQ1ljpZVegZaTwXwAXQkUP9MgMfUJIgdtOCyy6/ukINCHyBK9gdufpwrTAs aNGA== X-Gm-Message-State: AD7BkJJjG4+HKudzqjvVsL3+8VnLnhVx4R0+PsZR+WrPZa7Fe9fjNy03oJJKWpQg34diJA== X-Received: by 10.194.22.35 with SMTP id a3mr8239212wjf.165.1459330856255; Wed, 30 Mar 2016 02:40:56 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id v2sm3476437wmd.24.2016.03.30.02.40.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 02:40:55 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 03/13] drm/qxl: Use unlocked gem unreferencing Date: Wed, 30 Mar 2016 11:40:42 +0200 Message-Id: <1459330852-27668-4-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1459330852-27668-1-git-send-email-daniel.vetter@ffwll.ch> References: <1459330852-27668-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter , Dave Airlie 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=-5.1 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: Dave Airlie Signed-off-by: Daniel Vetter --- drivers/gpu/drm/qxl/qxl_fb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c index 7136e521e6db..bb7ce07b788b 100644 --- a/drivers/gpu/drm/qxl/qxl_fb.c +++ b/drivers/gpu/drm/qxl/qxl_fb.c @@ -443,11 +443,11 @@ out_unref: } } if (fb && ret) { - drm_gem_object_unreference(gobj); + drm_gem_object_unreference_unlocked(gobj); drm_framebuffer_cleanup(fb); kfree(fb); } - drm_gem_object_unreference(gobj); + drm_gem_object_unreference_unlocked(gobj); return ret; }