From patchwork Sat Aug 3 06:30:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: cuigaosheng X-Patchwork-Id: 13752296 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4C767C52D6D for ; Sat, 3 Aug 2024 06:31:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=55PH0to2dnBL6IfP6cBtTlj5m/mmf81UH7FY9nPa1cE=; b=uOYTFzfppawYk7vSOQ8wHzJ/IR jYuUsesV47pHbPjrJyeNzEfY2uWvDHg1RE5F2AjwpX8QpBeL/oawdf7PQenOFN0xjqHRzEwxUeuiV oX0I+9Ce9lOJG3KZobdxZUU8bBIh/ILKGrPflC3G6yWS2pqSwXlFCzdf7qp9qwe2TThuYQhj4dUAU oCh9a+nQFEhOxaoPjzSHWQwmjvVs1o1J33bImE65SQJ8Q2h1AKfnuyrUdhVtbhiMSnJUYA8Unf6dh LFPmwgHY2VdIFGueI0qE8ILIpd84B9Tn2+L1LD8PFh6zoQMuyA3AKE8/h0moBh7N7HYsDlCpEwL4k XD9GtqnA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sa8Ih-0000000Au1Y-2y2B; Sat, 03 Aug 2024 06:31:35 +0000 Received: from szxga02-in.huawei.com ([45.249.212.188]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sa8Hj-0000000Atui-22rr for linux-arm-kernel@lists.infradead.org; Sat, 03 Aug 2024 06:30:37 +0000 Received: from mail.maildlp.com (unknown [172.19.88.105]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4WbXpJ3jTqzfZVK; Sat, 3 Aug 2024 14:28:40 +0800 (CST) Received: from kwepemd200011.china.huawei.com (unknown [7.221.188.251]) by mail.maildlp.com (Postfix) with ESMTPS id 5BF421400DC; Sat, 3 Aug 2024 14:30:32 +0800 (CST) Received: from cgs.huawei.com (10.244.148.83) by kwepemd200011.china.huawei.com (7.221.188.251) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.34; Sat, 3 Aug 2024 14:30:31 +0800 From: Gaosheng Cui To: , , , , , , , , , , , , , , , , , , CC: , , Subject: [PATCH -next 1/3] drm/exynos: Add missing clk_disable_unprepare in exynos_fimd_resume Date: Sat, 3 Aug 2024 14:30:28 +0800 Message-ID: <20240803063030.316390-2-cuigaosheng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240803063030.316390-1-cuigaosheng1@huawei.com> References: <20240803063030.316390-1-cuigaosheng1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.244.148.83] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemd200011.china.huawei.com (7.221.188.251) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240802_233035_953540_8BD789E9 X-CRM114-Status: UNSURE ( 8.43 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add the missing clk_disable_unprepare() before return in exynos_fimd_resume(). Signed-off-by: Gaosheng Cui --- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index f57df8c48139..7be90f120a7e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -1312,6 +1312,7 @@ static int exynos_fimd_resume(struct device *dev) DRM_DEV_ERROR(dev, "Failed to prepare_enable the lcd clk [%d]\n", ret); + clk_disable_unprepare(ctx->bus_clk); return ret; } From patchwork Sat Aug 3 06:30:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: cuigaosheng X-Patchwork-Id: 13752297 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 670CCC3DA4A for ; Sat, 3 Aug 2024 06:32:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=DwpkSXFpCTR4w7RFHBWYyivCJ6LncxrhQBPUNxhTK8E=; b=JbatDPTkhEwSB1t4AAeSviKIUC 3jl+hHMVzUvJbXXoTsaAZ8b9lCt7DZ9mO1MXRH/L2dGJ0efgu6jyPIKOOs0Y1ZOVYQv44hVZi48kX oNQAI/V68Mwe/of76DzivjEyOBcyPQNoq3FpQ5aFQJ5kU/3u/cHhzhk7+GYbaQBxSaxMrUb8hL+Jj DEyXzAqsSnOq4O9gK6azKfS9mHxSdrbA04p6qdU86JsvNg28HsznziXLhNPgYb3C8a8KHNmBcoK/5 WE+kgKhJ8yKYgJ+l56WxTDzuO1kVgaI7AGMwZTt9jZLgOQxSKXf45PfNdQKgkDqNtczUg8QLyfXMN AkO8eygg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sa8JA-0000000Au8r-0NP5; Sat, 03 Aug 2024 06:32:04 +0000 Received: from szxga02-in.huawei.com ([45.249.212.188]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sa8Hj-0000000Atup-23C0 for linux-arm-kernel@lists.infradead.org; Sat, 03 Aug 2024 06:30:38 +0000 Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4WbXpK22wkzfZMT; Sat, 3 Aug 2024 14:28:41 +0800 (CST) Received: from kwepemd200011.china.huawei.com (unknown [7.221.188.251]) by mail.maildlp.com (Postfix) with ESMTPS id 23C361400D1; Sat, 3 Aug 2024 14:30:33 +0800 (CST) Received: from cgs.huawei.com (10.244.148.83) by kwepemd200011.china.huawei.com (7.221.188.251) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.34; Sat, 3 Aug 2024 14:30:32 +0800 From: Gaosheng Cui To: , , , , , , , , , , , , , , , , , , CC: , , Subject: [PATCH -next 2/3] drm/gem: Add missing clk_disable_unprepare in ade_power_up Date: Sat, 3 Aug 2024 14:30:29 +0800 Message-ID: <20240803063030.316390-3-cuigaosheng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240803063030.316390-1-cuigaosheng1@huawei.com> References: <20240803063030.316390-1-cuigaosheng1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.244.148.83] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemd200011.china.huawei.com (7.221.188.251) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240802_233035_953540_EFC1927D X-CRM114-Status: UNSURE ( 8.46 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add the missing clk_disable_unprepare() before return in ade_power_up(). Signed-off-by: Gaosheng Cui --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index 871f79a6b17e..942560a717ff 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -229,12 +229,14 @@ static int ade_power_up(struct ade_hw_ctx *ctx) ret = reset_control_deassert(ctx->reset); if (ret) { DRM_ERROR("failed to deassert reset\n"); + clk_disable_unprepare(ctx->media_noc_clk); return ret; } ret = clk_prepare_enable(ctx->ade_core_clk); if (ret) { DRM_ERROR("failed to enable ade_core_clk (%d)\n", ret); + clk_disable_unprepare(ctx->media_noc_clk); return ret; } From patchwork Sat Aug 3 06:30:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: cuigaosheng X-Patchwork-Id: 13752298 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E948DC52D6D for ; Sat, 3 Aug 2024 06:32:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=irWDQ5DIsNHpbC1WRdKF/9ZjQS0n6c/hFYVMs4XCR7Y=; b=nAHlYJq3Xo5tlF3RZHDMjOfmYS WpBrseY+xqNeTdLusiVYWUhjQ7P87bFbJS4qKboBCUwP7LT6nO8W10TxV2ceCW9r7nkxPvbqhRA7I xKRUj2CNCXoK52gqOm4kLT95+vRblbFUsh3IurSUaCsjUgq+2lgmyZOegmeWgS3c3LbfTkAavJbh1 0AjvmOyGzdE2oxVXHbQg+y0QSUWKBLAR4x5slg06zQAEPdQxsDmTRCnZs8g3yTXWkS5AuJ2PpQDxj oDyWV1jhV88ihxRptl2V05E/G5HD2HRu02maaWNrM1v251tWKq8Fa3R5VS+hF88Duk7yWd8FNAmOd oOZqKU8g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sa8Jc-0000000AuDz-2e6K; Sat, 03 Aug 2024 06:32:32 +0000 Received: from szxga01-in.huawei.com ([45.249.212.187]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sa8Hj-0000000Atuu-2b6r for linux-arm-kernel@lists.infradead.org; Sat, 03 Aug 2024 06:30:38 +0000 Received: from mail.maildlp.com (unknown [172.19.163.252]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4WbXrR2JvgzcdRj; Sat, 3 Aug 2024 14:30:31 +0800 (CST) Received: from kwepemd200011.china.huawei.com (unknown [7.221.188.251]) by mail.maildlp.com (Postfix) with ESMTPS id EADEB1800A4; Sat, 3 Aug 2024 14:30:33 +0800 (CST) Received: from cgs.huawei.com (10.244.148.83) by kwepemd200011.china.huawei.com (7.221.188.251) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.34; Sat, 3 Aug 2024 14:30:32 +0800 From: Gaosheng Cui To: , , , , , , , , , , , , , , , , , , CC: , , Subject: [PATCH -next 3/3] drm/kmb: Add missing clk_disable_unprepare in kmb_dsi_clk_enable Date: Sat, 3 Aug 2024 14:30:30 +0800 Message-ID: <20240803063030.316390-4-cuigaosheng1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240803063030.316390-1-cuigaosheng1@huawei.com> References: <20240803063030.316390-1-cuigaosheng1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.244.148.83] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemd200011.china.huawei.com (7.221.188.251) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240802_233035_956871_0C6F83D7 X-CRM114-Status: UNSURE ( 9.37 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add the missing clk_disable_unprepare() before return in kmb_dsi_clk_enable(). Signed-off-by: Gaosheng Cui --- drivers/gpu/drm/kmb/kmb_dsi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/kmb/kmb_dsi.c b/drivers/gpu/drm/kmb/kmb_dsi.c index cf7cf0b07541..02141ac593c6 100644 --- a/drivers/gpu/drm/kmb/kmb_dsi.c +++ b/drivers/gpu/drm/kmb/kmb_dsi.c @@ -1494,12 +1494,15 @@ static int kmb_dsi_clk_enable(struct kmb_dsi *kmb_dsi) ret = clk_prepare_enable(kmb_dsi->clk_mipi_ecfg); if (ret) { dev_err(dev, "Failed to enable MIPI_ECFG clock: %d\n", ret); + clk_disable_unprepare(kmb_dsi->clk_mipi); return ret; } ret = clk_prepare_enable(kmb_dsi->clk_mipi_cfg); if (ret) { dev_err(dev, "Failed to enable MIPI_CFG clock: %d\n", ret); + clk_disable_unprepare(kmb_dsi->clk_mipi); + clk_disable_unprepare(kmb_dsi->clk_mipi_ecfg); return ret; }