From patchwork Wed Mar 30 09:45:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8694601 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 55F22C0553 for ; Wed, 30 Mar 2016 09:46:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 833FF20376 for ; Wed, 30 Mar 2016 09:46:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B95BD20148 for ; Wed, 30 Mar 2016 09:46:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7068B6E745; Wed, 30 Mar 2016 09:46:46 +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 084536E754 for ; Wed, 30 Mar 2016 09:45:32 +0000 (UTC) Received: by mail-wm0-x232.google.com with SMTP id 20so62468997wmh.1 for ; Wed, 30 Mar 2016 02:45:31 -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=5ytQOBkMPXa4DxeD6J2YkD35HqzkIOk/uWsP75u8lQc=; b=B73UGv4Oka/sHAeBbEbLu3K6kIJNPPT3IWt95TwewiRfXuDEcCXzlsSak1nCwAq9OW x19U7znmMQ+/qCXtW1JDkdIL2lyHI5gOJ3n5zsukQpVN0g49lrLaV8O+S96shbeLbgwi In1MQUiGyjZUESE7zy1RAXABrfLTxDJ3SF/lA= 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=5ytQOBkMPXa4DxeD6J2YkD35HqzkIOk/uWsP75u8lQc=; b=S/bKFJC4AxPGGa72B2wvMge24UwKRLb+y7flE7UZwKJFeGw5eKUFY5agDmtuLdIaYk m5gANgWjl5KDHEUs36U/9p6wU99NrVVRCSK7b/zChRvLKVAVoYSUmRG+rLtJWWtk6YXh Gdq82DON/vJMWIU8DKqPcKuPvqMkR8cDmr+QLPdv2OduX9B+/UeWHwuacbt5ivzrWY6p XFYZlIzLQUXZ8JekAVmQfE/X3qCNanfNIvQPFGFonR4R9fqMKeAESvtYOxZysy+FCnkD nLw2vnlSPwAu0VmfHaQWt/ap+oBMntLP7pFkSe/ZNPEr5cni5p1iYWdqq1Q/0VJCLKTZ lAhQ== X-Gm-Message-State: AD7BkJKZAvmbiPVmgn/WU0BIbjqGB8rPTdnvvLCZRKiuKzuIxdVOyt8oGFm7Y4HfqDczNg== X-Received: by 10.28.46.5 with SMTP id u5mr9100500wmu.75.1459331130032; Wed, 30 Mar 2016 02:45:30 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id m130sm1905493wmf.10.2016.03.30.02.45.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 02:45:29 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 09/10] drm: Push struct_mutex into ->master_destroy Date: Wed, 30 Mar 2016 11:45:19 +0200 Message-Id: <1459331120-27864-10-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1459331120-27864-1-git-send-email-daniel.vetter@ffwll.ch> References: <1459331120-27864-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Thomas Hellstrom , 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=-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 Only two drivers implement this hook. vmwgfx (which doesn't need it really) and legacy radeon (which since v1 has been nuked, yay). v1: Rebase over radeon ums removal. Cc: Thomas Hellstrom Cc: Alex Deucher Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 167c8d3d4a31..845aa644c890 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -113,10 +113,10 @@ static void drm_master_destroy(struct kref *kref) struct drm_device *dev = master->minor->dev; struct drm_map_list *r_list, *list_temp; - mutex_lock(&dev->struct_mutex); if (dev->driver->master_destroy) dev->driver->master_destroy(dev, master); + mutex_lock(&dev->struct_mutex); list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) { if (r_list->master == master) { drm_legacy_rmmap_locked(dev, r_list->map);