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; }