From patchwork Tue Apr 26 17:29:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8941451 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 67E579F1C1 for ; Tue, 26 Apr 2016 17:31:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 94B36201F2 for ; Tue, 26 Apr 2016 17:31:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CDEC6201BB for ; Tue, 26 Apr 2016 17:31:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BF7986E8D9; Tue, 26 Apr 2016 17:30:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x22f.google.com (mail-wm0-x22f.google.com [IPv6:2a00:1450:400c:c09::22f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 87DF96E8AD for ; Tue, 26 Apr 2016 17:30:28 +0000 (UTC) Received: by mail-wm0-x22f.google.com with SMTP id u206so15716080wme.1 for ; Tue, 26 Apr 2016 10:30:28 -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=sqZObEvqDs05wDVBw9bvbpwWsu4ijyI2H+rjwEnupWw=; b=F2Tm5QyM5z4SjbxayTWyJ4n1fA45NcyOg0uOcZpL1fRh6p1OrgSIdpaCGB2r3VPCNX fJ7mBJDVruNc7vF7YQHKcSZQDk+CREa2doLW9pYLHPGQWhJ0IAIEq/za7x9RVdr2RjCI 4/wxuvTKQyHJNzHUAk38emZyzLlcMABLy2gso= 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=sqZObEvqDs05wDVBw9bvbpwWsu4ijyI2H+rjwEnupWw=; b=PHhpDNr7UwBBX7mQYK3iSnRQaLXvFPXzfl0lUow3ltNdmg+RGmzVgrMrpEFigsHuoj biuCe4yR2WqxT89VzuTQ1wIWy1gPBcQXQkpws+k9teLpQwCzTB0CV1XSzW8NBImUZ8Fi sgBPlhtQCJ/9biPKpHX72Q2JSWsbf11hWdRMTCQA2rYZNkEj4CymqOr64/m1ska391X4 dwhHDC9In0IhAWZWuQn6/ru2yhuaQONW0JFuBdyB9ooinPSwh6WxYSPG9S2X7mPnwriH pF4s76QNMwcjyNOdwpXKq+0amSujot5cvgzfoaK11t9KFA7qvyY+CY3ZaIeLjiJkm1wD sXfg== X-Gm-Message-State: AOPr4FULQFd0uZU9IaJ/vO6nl0yiv7vb6BKL7shPb0QA1AZWRr/iGl/6fj6ldOXSsa1nYA== X-Received: by 10.194.7.234 with SMTP id m10mr4641103wja.52.1461691826655; Tue, 26 Apr 2016 10:30:26 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id wr2sm29928678wjc.49.2016.04.26.10.30.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Apr 2016 10:30:26 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 05/35] drm: Push struct_mutex into ->master_destroy Date: Tue, 26 Apr 2016 19:29:38 +0200 Message-Id: <1461691808-12414-6-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461691808-12414-1-git-send-email-daniel.vetter@ffwll.ch> References: <1461691808-12414-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 Reviewed-by: Chris Wilson Reviewed-by: Alex Deucher --- 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 f8a7a6e66b7e..55273f8f3acb 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -123,10 +123,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);