From patchwork Wed Mar 30 09:40:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8694351 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 934CE9F44D for ; Wed, 30 Mar 2016 09:41:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C047D20379 for ; Wed, 30 Mar 2016 09:41:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 71C7320374 for ; Wed, 30 Mar 2016 09:41:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9D6E86E740; Wed, 30 Mar 2016 09:41:03 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x232.google.com (mail-wm0-x232.google.com [IPv6:2a00:1450:400c:c09::232]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1D39A6E732 for ; Wed, 30 Mar 2016 09:41:00 +0000 (UTC) Received: by mail-wm0-x232.google.com with SMTP id 20so62301471wmh.1 for ; Wed, 30 Mar 2016 02:41:00 -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=hjbbvDpEGpMx+duikkCnzzpp7a7ix62sZJagWQJEuXo=; b=ITBPIyTEJwRnkd2ehfWBs5DzLAdfDHswV4apZMJYzjX79JjPKvQkvwM/rDm1whEb7G pV4OY+ELv55PwMm9bprcRR1ZrYBYWssINn43BsBgo2WMhX8TP5cwl79m0xUIsvWO5DsR /NBV/ly8uCweWQZwhmus75uXAbGapX1PuqYus= 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=hjbbvDpEGpMx+duikkCnzzpp7a7ix62sZJagWQJEuXo=; b=MSaUH7Ue0AHfKKGPct0qP11AyVlTfOBcj/s2CcFLCCRGlEl/1Ux5TB+C7XMQYST5Ob AnmRHfIAq7Q65ibdmRSdOFOx6fJKHo3crR9lfSVLWdeTv4eG+XsihKdVdjvN4gr6wrjO 2gh4pMhnI9JK53sigZ32e7ktQnj/duDFeJrv/bm32cB0k+/l/VO5ouIhNFzuSjykN8v2 Pw+BQd78F+Pn9v5wgPEi9gQdtco/GCGAcaGfStll80e7a6+13M01p2+UYN2xZd7irXR5 uXLqYK8OAjwvLJqYnjIIRwwcHbJ64xx8N3h6ziHyuv7tNLAmKZQEehgos2IwN/RFR4yU u4MQ== X-Gm-Message-State: AD7BkJKQFGmVZ8va5uYtDzlF2/a5U1ezCZ80o/f14yZEVU56CTVSkU8HY6Lci9LyeuuMaA== X-Received: by 10.28.24.130 with SMTP id 124mr9031124wmy.50.1459330857230; Wed, 30 Mar 2016 02:40:57 -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.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 02:40:56 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 04/13] drm/udl: Use unlocked gem unreferencing Date: Wed, 30 Mar 2016 11:40:43 +0200 Message-Id: <1459330852-27668-5-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 Reviewed-by: poma --- 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 33239a2b264a..fd1eb9d03f0b 100644 --- a/drivers/gpu/drm/udl/udl_fb.c +++ b/drivers/gpu/drm/udl/udl_fb.c @@ -536,7 +536,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; }