From patchwork Mon Nov 23 09:32:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7678691 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 37A1BBF90C for ; Mon, 23 Nov 2015 09:33:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B087620643 for ; Mon, 23 Nov 2015 09:33:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 66BA620629 for ; Mon, 23 Nov 2015 09:33:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1A1AF720C9; Mon, 23 Nov 2015 01:33:20 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7362B720C3 for ; Mon, 23 Nov 2015 01:33:18 -0800 (PST) Received: by wmww144 with SMTP id w144so87842125wmw.1 for ; Mon, 23 Nov 2015 01:33:17 -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=4JBTg95vkCe9cv/JOn8eQy6LFYNlXve1yaX75qfg9r0=; b=Fuy2chA4VqUGDhiRn/aq8pSr5C+mC88qn0dGnLgHwYOU0Smb9YIZ/9HTa+XlMBaGL/ 61Ow4w/6aEchaEhjNmQjC2BsRuqYuy7iJb9AGB8TDk57z6loTz2wLbAUnAXNbJzgRuWS L7vqu/e/EIC5a6fmRFvN+U2XDbR/g0ax5cLug= 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=4JBTg95vkCe9cv/JOn8eQy6LFYNlXve1yaX75qfg9r0=; b=QJXhSDjhnarAU6kJFd2Ieekv1dJHuBSyu4BVYnPulzTNRm0fqiRYkY9VHFLQLORuvv vWhQ/02KcMTdsjaSa9UvVlwYcHZTS862aDSvid+IQktiZp2mEqxo24LpRvwGyHL0e6uy tgB3fYfD+kJsvjE+sk6aoMfprbkwJKU8sU09Oy+CO29Ki5ARWsPhvKOdVWJTA9gvSop7 S2XlvZkgAu+698k72LQj/UWlPTHMqfyf648KxDQz0D+qZTkVyNGvDoYV5/sg0SQF5Uxj CR8cMu7UNusvRyK0LWtGPl6lU6BTPTYsDGRy8vsDkx7sgnz3kwok2ag2fAaAKZ8swmFd NwZQ== X-Gm-Message-State: ALoCoQnPbrJzdCzd2rW2WSYeVtgWSnvpJP3A7AO2vqqh1UXVwHH9Yi3hCVobSQX5e/ryAMlSS18v X-Received: by 10.28.90.132 with SMTP id o126mr9899088wmb.1.1448271197174; Mon, 23 Nov 2015 01:33:17 -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.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 01:33:16 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 04/29] drm/amdgpu: Use unlocked gem unreferencing Date: Mon, 23 Nov 2015 10:32:37 +0100 Message-Id: <1448271183-20523-5-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: Alex Deucher , 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: Alex Deucher Signed-off-by: Daniel Vetter --- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c index 6fcbbcc2e99e..cfb6caad2a73 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c @@ -263,7 +263,7 @@ out_unref: } if (fb && ret) { - drm_gem_object_unreference(gobj); + drm_gem_object_unreference_unlocked(gobj); drm_framebuffer_unregister_private(fb); drm_framebuffer_cleanup(fb); kfree(fb);