From patchwork Thu Oct 15 07:36:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7403511 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 D71449F1B9 for ; Thu, 15 Oct 2015 07:34:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EFE9A207E1 for ; Thu, 15 Oct 2015 07:34:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 148AB20782 for ; Thu, 15 Oct 2015 07:34:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EEA837A099; Thu, 15 Oct 2015 00:34:07 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by gabe.freedesktop.org (Postfix) with ESMTPS id EB2D77A0EB for ; Thu, 15 Oct 2015 00:34:04 -0700 (PDT) Received: by wicgb1 with SMTP id gb1so15376549wic.1 for ; Thu, 15 Oct 2015 00:34:03 -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=eJ6EO+Zgr8nqBk27vlDzRu990kE7zY90KnZEZnwQyGA=; b=M2mZWbs8Sko5BBt5TEEhsGf6x+nXKg1iNi810PoTePKrsUB0Yu+ahLj5CNBMgQaZHi IR9Fr9n0OhsHeWbBwpbX8fEVOy+2B/YCTHnsCBOzzfKRy7xZX/EnuuEBUxHQrpdFOTkI +TI05knAX/8IDAV0t26ABbYdcWQI2mofw99es= 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=eJ6EO+Zgr8nqBk27vlDzRu990kE7zY90KnZEZnwQyGA=; b=Kxdv5hxl4ojJGsla8C7SUDM/E3clMjVfOm6D+cj8j4vm7iCfYkjN+tFLmzDyV0geWP zwZy0PG/EB+C8bufZ3m7SAHQ8QS4qAxZB+XFY1VlZFLW7EgWbCl1pGgGfNj7M5Km4LfR PvuctljnG+lj39uJazAwW3ulNcDSgZVTCwGwLPYr3XFv1cqoEcjwY3M40PDc6h/ssfU7 dvZJ2g8L5jurb7EaHGSEkofnTEH+E54IxbwA/CDGvNdd4CTmCDmWPArv16coV4aY2rYL x5yam/HT7ORc5/HILnHD7ByqAOQpnRHr6lV9zjt+BiTdyjgQYzPwYXn9Se9b75jbvOoH c7ig== X-Gm-Message-State: ALoCoQmRdbnX+rznjGiNNpJwaZ6rXJ4vQL2q/2+MrjRv0Y9lBu1SZ4Lse+8zIq3QSC0pGjmGzsjj X-Received: by 10.194.23.2 with SMTP id i2mr8769622wjf.106.1444894443762; Thu, 15 Oct 2015 00:34:03 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id z4sm10201014wjz.29.2015.10.15.00.34.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Oct 2015 00:34:02 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 14/25] drm/gma500: Drop dev->struct_mutex from fbdev init/teardown code Date: Thu, 15 Oct 2015 09:36:30 +0200 Message-Id: <1444894601-5200-15-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1444894601-5200-1-git-send-email-daniel.vetter@ffwll.ch> References: <1444894601-5200-1-git-send-email-daniel.vetter@ffwll.ch> Cc: 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.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 This is init/teardown code, locking is just to appease locking checks. And since gem create/free doesn't need this any more there's really no reason for grabbing dev->struct_mutex. Again important to switch obj_unref to _unlocked variants. Signed-off-by: Daniel Vetter Signed-off-by: Patrik Jakobsson --- drivers/gpu/drm/gma500/framebuffer.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c index 2eaf1b31c7bd..c7904fc3d33b 100644 --- a/drivers/gpu/drm/gma500/framebuffer.c +++ b/drivers/gpu/drm/gma500/framebuffer.c @@ -406,8 +406,6 @@ static int psbfb_create(struct psb_fbdev *fbdev, memset(dev_priv->vram_addr + backing->offset, 0, size); - mutex_lock(&dev->struct_mutex); - info = drm_fb_helper_alloc_fbi(&fbdev->psb_fb_helper); if (IS_ERR(info)) { ret = PTR_ERR(info); @@ -463,17 +461,15 @@ static int psbfb_create(struct psb_fbdev *fbdev, dev_dbg(dev->dev, "allocated %dx%d fb\n", psbfb->base.width, psbfb->base.height); - mutex_unlock(&dev->struct_mutex); return 0; out_unref: if (backing->stolen) psb_gtt_free_range(dev, backing); else - drm_gem_object_unreference(&backing->gem); + drm_gem_object_unreference_unlocked(&backing->gem); drm_fb_helper_release_fbi(&fbdev->psb_fb_helper); out_err1: - mutex_unlock(&dev->struct_mutex); psb_gtt_free_range(dev, backing); return ret; } @@ -569,7 +565,7 @@ static int psb_fbdev_destroy(struct drm_device *dev, struct psb_fbdev *fbdev) drm_framebuffer_cleanup(&psbfb->base); if (psbfb->gtt) - drm_gem_object_unreference(&psbfb->gtt->gem); + drm_gem_object_unreference_unlocked(&psbfb->gtt->gem); return 0; } @@ -784,12 +780,8 @@ void psb_modeset_cleanup(struct drm_device *dev) { struct drm_psb_private *dev_priv = dev->dev_private; if (dev_priv->modeset) { - mutex_lock(&dev->struct_mutex); - drm_kms_helper_poll_fini(dev); psb_fbdev_fini(dev); drm_mode_config_cleanup(dev); - - mutex_unlock(&dev->struct_mutex); } }