From patchwork Mon Nov 23 09:32:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7678551 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 28CA39F750 for ; Mon, 23 Nov 2015 09:33:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5ABBD2061D for ; Mon, 23 Nov 2015 09:33:20 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DAD452062F for ; Mon, 23 Nov 2015 09:33:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 328E06E495; Mon, 23 Nov 2015 01:33:16 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by gabe.freedesktop.org (Postfix) with ESMTPS id 587CF6E490 for ; Mon, 23 Nov 2015 01:33:15 -0800 (PST) Received: by wmvv187 with SMTP id v187so151233269wmv.1 for ; Mon, 23 Nov 2015 01:33:14 -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=1zqv6asXEWtOuccPzHGpBNl05YYJXNFmruqTlm3HN/E=; b=YIL0HAeFvzhnwOsqxdZJmTx8GfwuyxCf7CC5XoIwCE7orFY/Iho27klmxeQTOLyeCm LjyHrYJWzQTRXIMFVunNYbipX21RRV9cb25HjKKWBYw+yfavMG+/BoI9Tv50U6TFZ8Nw jsoCjiQ5zo2iNfLiM64kRYWIrIfqXNcVRpIXg= 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=1zqv6asXEWtOuccPzHGpBNl05YYJXNFmruqTlm3HN/E=; b=TNt5jAx2DJC59fTgmwINe1Jw2kZIL3HoD7G5wwO1tP4aui674g4eansDi0XjYzsscg za4Ihm0VcTQ/PE6ylNR4gBavtXPtC0+QOzz5Cb6jSlujEcA/5xcJGiD0TW4nYHMwyqpx BuGWPFEMDfaAiJ9bHL1GsCP8+rKt6/NTtlukydCr9MQ/pkkCosrc+wSOBuZGd9Zh1TdA AAXa6pwrh+I7KjjDO2pA1pflYuzNK9xiFx41bdiXKVi+oVjvwg/cGv5oBZKu+QYRzZ2q YlgAoLWKmI9umFBIaXDn6jHx6bZ14VSyzdWtsaMq196mjuA0Iv46/6LzHdGbvOvVKyt5 qjQw== X-Gm-Message-State: ALoCoQnFk1WLOXvZC2AoVJAx72eHIRs652Y+QPJ2UDgGKL8jFKWagw17HQkBDlOrH37LG29moasa X-Received: by 10.194.236.6 with SMTP id uq6mr6994582wjc.126.1448271193946; Mon, 23 Nov 2015 01:33:13 -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.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 01:33:13 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 01/29] drm/armada: Use unlocked gem unreferencing Date: Mon, 23 Nov 2015 10:32:34 +0100 Message-Id: <1448271183-20523-2-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 , Russell King 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: Russell King Signed-off-by: Daniel Vetter --- drivers/gpu/drm/armada/armada_crtc.c | 2 +- drivers/gpu/drm/armada/armada_gem.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index cebcab560626..7ea35bee7cd5 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -972,7 +972,7 @@ static void armada_drm_crtc_destroy(struct drm_crtc *crtc) struct armada_private *priv = crtc->dev->dev_private; if (dcrtc->cursor_obj) - drm_gem_object_unreference(&dcrtc->cursor_obj->obj); + drm_gem_object_unreference_unlocked(&dcrtc->cursor_obj->obj); priv->dcrtc[dcrtc->num] = NULL; drm_crtc_cleanup(&dcrtc->crtc); diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c index 60a688ef81c7..aaf88641bfc5 100644 --- a/drivers/gpu/drm/armada/armada_gem.c +++ b/drivers/gpu/drm/armada/armada_gem.c @@ -352,13 +352,13 @@ int armada_gem_mmap_ioctl(struct drm_device *dev, void *data, return -ENOENT; if (!dobj->obj.filp) { - drm_gem_object_unreference(&dobj->obj); + drm_gem_object_unreference_unlocked(&dobj->obj); return -EINVAL; } addr = vm_mmap(dobj->obj.filp, 0, args->size, PROT_READ | PROT_WRITE, MAP_SHARED, args->offset); - drm_gem_object_unreference(&dobj->obj); + drm_gem_object_unreference_unlocked(&dobj->obj); if (IS_ERR_VALUE(addr)) return addr;