From patchwork Thu May 27 06:10:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 12283389 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26EAAC4708A for ; Thu, 27 May 2021 06:17:54 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9D1DA60249 for ; Thu, 27 May 2021 06:17:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9D1DA60249 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=wanadoo.fr Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 69C1A6E0D9; Thu, 27 May 2021 06:17:52 +0000 (UTC) Received: from smtp.smtpout.orange.fr (smtp02.smtpout.orange.fr [80.12.242.124]) by gabe.freedesktop.org (Postfix) with ESMTP id D49D26E0D9 for ; Thu, 27 May 2021 06:17:50 +0000 (UTC) Received: from localhost.localdomain ([86.243.172.93]) by mwinf5d25 with ME id 9iAG2500521Fzsu03iAGgj; Thu, 27 May 2021 08:10:18 +0200 X-ME-Helo: localhost.localdomain X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Thu, 27 May 2021 08:10:18 +0200 X-ME-IP: 86.243.172.93 From: Christophe JAILLET To: anitha.chrisanthus@intel.com, edmund.j.dea@intel.com, airlied@linux.ie, daniel@ffwll.ch, sam@ravnborg.org Subject: [PATCH v2 1/2] drm/kmb: Fix an error handling path Date: Thu, 27 May 2021 08:10:14 +0200 Message-Id: <91d2b0417ccb8497b977e175b0b44417e47405aa.1622095610.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christophe JAILLET , kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" If 'platform_get_irq()' fails, it is spurious to call 'of_reserved_mem_device_release()' in the error handling path, because 'of_reserved_mem_device_init() has not been called yet. Moreover, a previous 'kmb_initialize_clocks()' is unbalanced by a corresponding 'kmb_display_clk_disable()' call, has already done in the remove function. It is likely that 'kmb_display_clk_disable()' is expected in the error handling path, instead of 'of_reserved_mem_device_release()'. Also, it is spurious to return directly if 'of_reserved_mem_device_init()' fails. Goto the error handling path instead to free some resources. Fixes: 7f7b96a8a0a1 ("drm/kmb: Add support for KeemBay Display") Signed-off-by: Christophe JAILLET --- v2: Keep label name Fix the commit message where a wrong function name was used --- drivers/gpu/drm/kmb/kmb_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/kmb/kmb_drv.c b/drivers/gpu/drm/kmb/kmb_drv.c index f64e06e1067d..fa28e42da460 100644 --- a/drivers/gpu/drm/kmb/kmb_drv.c +++ b/drivers/gpu/drm/kmb/kmb_drv.c @@ -144,7 +144,7 @@ static int kmb_hw_init(struct drm_device *drm, unsigned long flags) /* Get the optional framebuffer memory resource */ ret = of_reserved_mem_device_init(drm->dev); if (ret && ret != -ENODEV) - return ret; + goto setup_fail; spin_lock_init(&kmb->irq_lock); @@ -153,7 +153,7 @@ static int kmb_hw_init(struct drm_device *drm, unsigned long flags) return 0; setup_fail: - of_reserved_mem_device_release(drm->dev); + kmb_display_clk_disable(kmb); return ret; } From patchwork Thu May 27 06:10:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 12283391 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79F81C4707F for ; Thu, 27 May 2021 06:18:01 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 19CC560249 for ; Thu, 27 May 2021 06:18:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 19CC560249 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=wanadoo.fr Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 99A356E1D3; Thu, 27 May 2021 06:18:00 +0000 (UTC) Received: from smtp.smtpout.orange.fr (smtp02.smtpout.orange.fr [80.12.242.124]) by gabe.freedesktop.org (Postfix) with ESMTP id A6F1D6E1D3 for ; Thu, 27 May 2021 06:17:58 +0000 (UTC) Received: from localhost.localdomain ([86.243.172.93]) by mwinf5d25 with ME id 9iAS2500H21Fzsu03iAThz; Thu, 27 May 2021 08:10:27 +0200 X-ME-Helo: localhost.localdomain X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Thu, 27 May 2021 08:10:27 +0200 X-ME-IP: 86.243.172.93 From: Christophe JAILLET To: anitha.chrisanthus@intel.com, edmund.j.dea@intel.com, airlied@linux.ie, daniel@ffwll.ch, sam@ravnborg.org Subject: [PATCH v2 2/2] drm/kmb: Do not report 0 (success) in case of error Date: Thu, 27 May 2021 08:10:25 +0200 Message-Id: <8b7f10d6373e117cc26487e1c6963e637bc01dee.1622095610.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.30.2 In-Reply-To: <91d2b0417ccb8497b977e175b0b44417e47405aa.1622095610.git.christophe.jaillet@wanadoo.fr> References: <91d2b0417ccb8497b977e175b0b44417e47405aa.1622095610.git.christophe.jaillet@wanadoo.fr> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christophe JAILLET , kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 'ret' is known to be 0 at this point. Reporting the error from the previous 'platform_get_irq()' call is likely, so add the missing assignment. Fixes: 7f7b96a8a0a1 ("drm/kmb: Add support for KeemBay Display") Signed-off-by: Christophe JAILLET --- v2: New patch --- drivers/gpu/drm/kmb/kmb_drv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/kmb/kmb_drv.c b/drivers/gpu/drm/kmb/kmb_drv.c index fa28e42da460..d9e10ac9847c 100644 --- a/drivers/gpu/drm/kmb/kmb_drv.c +++ b/drivers/gpu/drm/kmb/kmb_drv.c @@ -138,6 +138,7 @@ static int kmb_hw_init(struct drm_device *drm, unsigned long flags) irq_lcd = platform_get_irq(pdev, 0); if (irq_lcd < 0) { drm_err(&kmb->drm, "irq_lcd not found"); + ret = irq_lcd; goto setup_fail; }