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=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY 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 87C7AC10F13 for ; Tue, 16 Apr 2019 08:25:18 +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 55A0120821 for ; Tue, 16 Apr 2019 08:25:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="d2scoqwF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 55A0120821 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=WYcFvLqZWz8MDihCe36Kgs5JOGYxXQPbDBWTluzuZtw=; b=d2scoqwFA1SOjM WlQFwB+yxAAOpMunbENQgg1KzBsBcToFWxIkyOWH66jVU7fZaIjIR5l+20SugjcKEvOm5fcOfrqCK VGqOeORhvopsfng68oi0WK9x9mG6tj7dbiwgY8KzV2fZ5rvE0K8SHW1Nfc859v7OAKbngVcdFv3Wc Ym21zOG8XTWzjB2S94o/ui3tp53coCaqO6azA3XhzFSi0liREvoUyIhqT54hRwsY+iSc9zcS8hHnQ GWWUXJ+LECsO6MsGn/qgo9wWT5a66A5vdQ9E6sA9LI5QgSuIFLeyukZ9GHg4we0rgJNv4V1EKBXD7 P8kqFkYUAVnfLT5HXdCA==; 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 1hGJOz-0002AS-FI; Tue, 16 Apr 2019 08:25:13 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGJOv-00029F-BO; Tue, 16 Apr 2019 08:25:11 +0000 X-UUID: e479bf55111e4f1fac54b22efcffc960-20190416 X-UUID: e479bf55111e4f1fac54b22efcffc960-20190416 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1115478926; Tue, 16 Apr 2019 00:24:59 -0800 Received: from MTKMBS01N2.mediatek.inc (172.21.101.79) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 16 Apr 2019 01:24:58 -0700 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs01n2.mediatek.inc (172.21.101.79) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 16 Apr 2019 16:24:50 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 16 Apr 2019 16:24:50 +0800 Message-ID: <1555403090.11519.7.camel@mtksdaap41> Subject: Re: [PATCH v2 22/25] drm/mediatek: adjust ddp clock control flow From: CK Hu To: Date: Tue, 16 Apr 2019 16:24:50 +0800 In-Reply-To: <1553667561-25447-23-git-send-email-yongqiang.niu@mediatek.com> References: <1553667561-25447-1-git-send-email-yongqiang.niu@mediatek.com> <1553667561-25447-23-git-send-email-yongqiang.niu@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: C20A49221A17F4645C353DCCE33E7FC4FE3F8AEC421024D5C67E4CC2E8201E312000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190416_012509_397463_AB8576CB X-CRM114-Status: GOOD ( 15.39 ) 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 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 > > 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