From patchwork Mon Nov 23 09:32:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7678771 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 637A5C05CA for ; Mon, 23 Nov 2015 09:33:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8DCB52062F for ; Mon, 23 Nov 2015 09:33:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9E13320621 for ; Mon, 23 Nov 2015 09:33:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1AD24720EC; 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-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id 514D6720CF for ; Mon, 23 Nov 2015 01:33:23 -0800 (PST) Received: by wmuu63 with SMTP id u63so45627012wmu.0 for ; Mon, 23 Nov 2015 01:33:22 -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=lTwB7if3zQy06GwYq8To0mLIkbL8GQKFC7+eP7sbqQo=; b=EUXLvyGzWJKxENivFKriJPo0D9k0V2hROfw+HXefXkn+TzZD4SASm81lJloDj9z6ne eIhWLz9zs88pkP/qjnUGbXrh+CyUmEhUD+3VXwNMmw2Avwo149JT8wROfNI1v0ixKyWU 3vQvyqTe1X7ikTOl7V+FFFXwwjCwWQBm/awaw= 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=lTwB7if3zQy06GwYq8To0mLIkbL8GQKFC7+eP7sbqQo=; b=AmGDL/Ysr95hQDsbQoANFi3+xxi2QaA0Delz93TfNgra14600PeQghT+dQM2NHsMi6 ZHXSJyRwGZCt5PKGOft3XMe2GQR58hvANID4jHkPEgKxZRUqo00rfyTqmGG9Zp1/bu5d 38LlLt8tXPse1aHDlBoiUz046B+Va1ydwh5TxcaV0rMLI8cLDfKObsJkLGTzAw2OuUSN tEDapghnboedExBbFcMccpP7Ti+pMUgpgdgqK2uM9jcp7g2wQFK/zKRR/aebSWjOxgdf eI2BLxw3wGVmcS+6LLKqOm3JowVC4OlwpyQPEuUbW32Lm7HB0mIz15lpGsv6Q1/6KEZj +rkQ== X-Gm-Message-State: ALoCoQnnZej/qnW5XiS6wXka7tGpSjOxPd3O4CYsIQc2LknwY0FmQO0X4eOCbyHCOOwHwzTo0rGC X-Received: by 10.194.89.34 with SMTP id bl2mr29673698wjb.9.1448271202031; Mon, 23 Nov 2015 01:33:22 -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.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 01:33:21 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 09/29] drm/udl: Use unlocked gem unreferencing Date: Mon, 23 Nov 2015 10:32:42 +0100 Message-Id: <1448271183-20523-10-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 , Daniel Vetter , Intel Graphics Development , 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=-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: Dave Airlie Signed-off-by: Daniel Vetter --- drivers/gpu/drm/udl/udl_fb.c | 2 +- drivers/gpu/drm/udl/udl_gem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c index 200419d4d43c..18a2acbccb7d 100644 --- a/drivers/gpu/drm/udl/udl_fb.c +++ b/drivers/gpu/drm/udl/udl_fb.c @@ -538,7 +538,7 @@ static int udlfb_create(struct drm_fb_helper *helper, out_destroy_fbi: drm_fb_helper_release_fbi(helper); out_gfree: - drm_gem_object_unreference(&ufbdev->ufb.obj->base); + drm_gem_object_unreference_unlocked(&ufbdev->ufb.obj->base); out: return ret; } diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c index 2a0a784ab6ee..d7528e0d8442 100644 --- a/drivers/gpu/drm/udl/udl_gem.c +++ b/drivers/gpu/drm/udl/udl_gem.c @@ -52,7 +52,7 @@ udl_gem_create(struct drm_file *file, return ret; } - drm_gem_object_unreference(&obj->base); + drm_gem_object_unreference_unlocked(&obj->base); *handle_p = handle; return 0; }