From mboxrd@z Thu Jan 1 00:00:00 1970 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=-12.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH, UNPARSEABLE_RELAY,URIBL_BLOCKED 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 22762C04AB6 for ; Tue, 28 May 2019 05:35:53 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id EBA002070D for ; Tue, 28 May 2019 05:35:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="nEnkdOsR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EBA002070D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GvRulkSQC0vTWgoSdjscutXU1WukoHlDLwguF5x2mY8=; b=nEnkdOsR2Ctg03 959IS6NZ73cLQsPzp79NseiV24bWeUCbKvU8TmJCEt5aI6CJhOVxyRvyV6rINmaa79U3JjhMe5Ah2 X+GAfDqmzl829chzpwNflM3MqKEGqY5EeJGTtrbwgHm26dnCurt3p4irATYpLl6o3i/wd/Y+aBPoS rgvVQRbV6s1pKj2P2fL2DbGSQM3fvhKouku6WDVzovBeidOg+Jdzg7GiVqXXBitXjKMQf2YP3TzvU LETIrWVX4+W+U86L6BqvuDfRXuR6mwVoU1dwl5D7IAYcfZBjzFaDET36fq3WOoU1LLIdGbnXZT1/B tb9ZEtSGnbsgGxFbKqTw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hVUm4-00022E-OF; Tue, 28 May 2019 05:35:48 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hVUlv-0001nB-62; Tue, 28 May 2019 05:35:42 +0000 X-UUID: 343c54c9b2a14a35b6f9036f7cbd6ef4-20190527 X-UUID: 343c54c9b2a14a35b6f9036f7cbd6ef4-20190527 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 212699397; Mon, 27 May 2019 21:35:32 -0800 Received: from mtkmbs05n1.mediatek.inc (172.21.101.15) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 27 May 2019 22:35:31 -0700 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs05n1.mediatek.inc (172.21.101.15) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 28 May 2019 13:35:29 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 28 May 2019 13:35:29 +0800 Message-ID: <1559021729.15879.1.camel@mtksdaap41> Subject: Re: [PATCH v2 22/25] drm/mediatek: adjust ddp clock control flow From: CK Hu To: Date: Tue, 28 May 2019 13:35:29 +0800 In-Reply-To: <1555403090.11519.7.camel@mtksdaap41> References: <1553667561-25447-1-git-send-email-yongqiang.niu@mediatek.com> <1553667561-25447-23-git-send-email-yongqiang.niu@mediatek.com> <1555403090.11519.7.camel@mtksdaap41> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190527_223539_676582_5A417BB0 X-CRM114-Status: GOOD ( 16.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, Bibby.Hsieh@mediatek.com, airlied@linux.ie, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, yt.shen@mediatek.com, robh+dt@kernel.org, linux-mediatek@lists.infradead.org, p.zabel@pengutronix.de, matthias.bgg@gmail.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, Yongqiang: On Tue, 2019-04-16 at 16:24 +0800, CK Hu wrote: > Hi, Yongqiang: > > On Wed, 2019-03-27 at 14:19 +0800, yongqiang.niu@mediatek.com wrote: > > From: Yongqiang Niu > > > > display hardware clock will not unprepare when > > crtc is disable, until crtc is destroyed. > > with this patch, hard clock will disable and unprepare > > at the same time. > > Reviewed-by: CK Hu This patch looks independent, so I've applied it to mediatek-drm-fixes-5.2 [1], thanks. [1] https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-fixes-5.2 Regards, CK > > > > > Signed-off-by: Yongqiang Niu > > --- > > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 26 ++++++-------------------- > > 1 file changed, 6 insertions(+), 20 deletions(-) > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > index 0f97ee3..606c6e2 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > > @@ -195,7 +195,7 @@ static int mtk_crtc_ddp_clk_enable(struct mtk_drm_crtc *mtk_crtc) > > > > DRM_DEBUG_DRIVER("%s\n", __func__); > > for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) { > > - ret = clk_enable(mtk_crtc->ddp_comp[i]->clk); > > + ret = clk_prepare_enable(mtk_crtc->ddp_comp[i]->clk); > > if (ret) { > > DRM_ERROR("Failed to enable clock %d: %d\n", i, ret); > > goto err; > > @@ -205,7 +205,7 @@ static int mtk_crtc_ddp_clk_enable(struct mtk_drm_crtc *mtk_crtc) > > return 0; > > err: > > while (--i >= 0) > > - clk_disable(mtk_crtc->ddp_comp[i]->clk); > > + clk_disable_unprepare(mtk_crtc->ddp_comp[i]->clk); > > return ret; > > } > > > > @@ -215,7 +215,7 @@ static void mtk_crtc_ddp_clk_disable(struct mtk_drm_crtc *mtk_crtc) > > > > DRM_DEBUG_DRIVER("%s\n", __func__); > > for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) > > - clk_disable(mtk_crtc->ddp_comp[i]->clk); > > + clk_disable_unprepare(mtk_crtc->ddp_comp[i]->clk); > > } > > > > static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc) > > @@ -615,15 +615,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, > > if (!comp) { > > dev_err(dev, "Component %pOF not initialized\n", node); > > ret = -ENODEV; > > - goto unprepare; > > - } > > - > > - ret = clk_prepare(comp->clk); > > - if (ret) { > > - dev_err(dev, > > - "Failed to prepare clock for component %pOF: %d\n", > > - node, ret); > > - goto unprepare; > > + return ret; > > } > > > > mtk_crtc->ddp_comp[i] = comp; > > @@ -649,23 +641,17 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, > > ret = mtk_plane_init(drm_dev, &mtk_crtc->planes[zpos], > > BIT(pipe), type); > > if (ret) > > - goto unprepare; > > + return ret; > > } > > > > ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, &mtk_crtc->planes[0], > > mtk_crtc->layer_nr > 1 ? &mtk_crtc->planes[1] : > > NULL, pipe); > > if (ret < 0) > > - goto unprepare; > > + return ret; > > drm_mode_crtc_set_gamma_size(&mtk_crtc->base, MTK_LUT_SIZE); > > drm_crtc_enable_color_mgmt(&mtk_crtc->base, 0, false, MTK_LUT_SIZE); > > priv->num_pipes++; > > > > return 0; > > - > > -unprepare: > > - while (--i >= 0) > > - clk_unprepare(mtk_crtc->ddp_comp[i]->clk); > > - > > - return ret; > > } > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel