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@xxxxxxxxxxxx wrote: > > From: Yongqiang Niu <yongqiang.niu@xxxxxxxxxxxx> > > > > 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 <ck.hu@xxxxxxxxxxxx> 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 <yongqiang.niu@xxxxxxxxxxxx> > > --- > > 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; > > } >
