From patchwork Thu Oct 15 07:36:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7403631 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 4F7039F506 for ; Thu, 15 Oct 2015 07:34:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 736C620785 for ; Thu, 15 Oct 2015 07:34:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 1FDB220851 for ; Thu, 15 Oct 2015 07:34:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 824977A11C; Thu, 15 Oct 2015 00:34:22 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7B94D7A112 for ; Thu, 15 Oct 2015 00:34:13 -0700 (PDT) Received: by wicgb1 with SMTP id gb1so259847090wic.1 for ; Thu, 15 Oct 2015 00:34:12 -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=9mA0eC5bxdB8l+a3jkwNUDUm2z8Cumt4i0lzT8as2J0=; b=gR39fTJCy6VCVn46XY6jRKSmBXeFhW5XcP/SKXjD6TKbdbS5DLFdEW91JQEP7IYI7Q mhUKmfyBDbGQBzqHmFBABRzs5yZGsni84dFktFg+xSwqmXsLPr9Vj36LFVoNnBWhT+7r 7KfJFw/33KWN4GxQnS5MleLvlXEF1+u6cXRQs= 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=9mA0eC5bxdB8l+a3jkwNUDUm2z8Cumt4i0lzT8as2J0=; b=TKoQZPjPX158SSRIUxK4fb9TbwulMKo2K51jCc1etpaHriMYXvOgd9mJB7EzgL5lhM C2pXVwm6jloyuGAIvvFusmJ/qrcrT8s5TMscpi4tVaxhueTpIFzlBe+lMh1tjpudDzOz 1rWdoBsuYyzOWe71X6cUzua7PQeLL5aaP/NgiVpwesDw4yel2vL9qZkFx+exi+qjZ0kP 42cO5ZgM8QYGTUDW5gwIa13mnSYZ8ey9JKG/24Cqox9orkHfybcY0/TSKVnbl0lSyp+E bCcu0UqozAE8/73kmj/Bul+dwLv2BxABB4aGaw1ki5nnzt0+01o7eaIK+6HgT3T/HcbK codg== X-Gm-Message-State: ALoCoQlTgFIPBvtOzXY4ndK7uZs6MjE0dY4yePLhbEXCs0p0CyWdnJRrYEs4PLV4zwcQzmY5dmFt X-Received: by 10.180.90.166 with SMTP id bx6mr30770344wib.93.1444894452238; Thu, 15 Oct 2015 00:34:12 -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.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Oct 2015 00:34:11 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 22/25] drm/exynos: drop struct_mutex from fbdev setup Date: Thu, 15 Oct 2015 09:36:38 +0200 Message-Id: <1444894601-5200-23-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 , 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 Doesn't protect anything at all, and probably just here because a long time ago dev->struct_mutex was required to allocate gem objects. With this patch exynos is completely struct_mutex free! Signed-off-by: Daniel Vetter --- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index a221f753ad9c..4e2166d4a964 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c @@ -137,8 +137,6 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper, mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp, sizes->surface_depth); - mutex_lock(&dev->struct_mutex); - size = mode_cmd.pitches[0] * mode_cmd.height; obj = exynos_drm_gem_create(dev, EXYNOS_BO_CONTIG, size); @@ -152,10 +150,8 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper, obj = exynos_drm_gem_create(dev, EXYNOS_BO_NONCONTIG, size); } - if (IS_ERR(obj)) { - ret = PTR_ERR(obj); - goto out; - } + if (IS_ERR(obj)) + return PTR_ERR(obj); exynos_fbdev->obj = obj; @@ -170,7 +166,6 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper, if (ret < 0) goto err_destroy_framebuffer; - mutex_unlock(&dev->struct_mutex); return ret; err_destroy_framebuffer: @@ -178,13 +173,12 @@ err_destroy_framebuffer: err_destroy_gem: exynos_drm_gem_destroy(obj); -/* - * if failed, all resources allocated above would be released by - * drm_mode_config_cleanup() when drm_load() had been called prior - * to any specific driver such as fimd or hdmi driver. - */ -out: - mutex_unlock(&dev->struct_mutex); + /* + * if failed, all resources allocated above would be released by + * drm_mode_config_cleanup() when drm_load() had been called prior + * to any specific driver such as fimd or hdmi driver. + */ + return ret; }