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=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham 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 387A2C49ED7 for ; Mon, 16 Sep 2019 07:55:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0AC2120650 for ; Mon, 16 Sep 2019 07:55:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730464AbfIPHzr (ORCPT ); Mon, 16 Sep 2019 03:55:47 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:16670 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726074AbfIPHzq (ORCPT ); Mon, 16 Sep 2019 03:55:46 -0400 X-UUID: cdd2059cd0e84fb58249955718d5a645-20190916 X-UUID: cdd2059cd0e84fb58249955718d5a645-20190916 Received: from mtkcas09.mediatek.inc [(172.21.101.178)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1205137553; Mon, 16 Sep 2019 15:55:42 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 16 Sep 2019 15:55:40 +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; Mon, 16 Sep 2019 15:55:40 +0800 Message-ID: <1568620540.7280.1.camel@mtksdaap41> Subject: Re: [PATCH v3 12/14] drm/mediatek: Add pm runtime support for ovl and rdma From: CK Hu To: Yong Wu CC: Matthias Brugger , Joerg Roedel , Rob Herring , , , Nicolas Boichat , , , , Will Deacon , , Evan Green , Tomasz Figa , , Matthias Kaehlcke , , Yongqiang Niu , , , Robin Murphy , Date: Mon, 16 Sep 2019 15:55:40 +0800 In-Reply-To: <1567503456-24725-13-git-send-email-yong.wu@mediatek.com> References: <1567503456-24725-1-git-send-email-yong.wu@mediatek.com> <1567503456-24725-13-git-send-email-yong.wu@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Yong: On Tue, 2019-09-03 at 17:37 +0800, Yong Wu wrote: > From: Yongqiang Niu > > Display use the dispsys device to call pm_rumtime_get_sync before. > This patch add pm_runtime_xx with ovl and rdma device which has linked > with larb0, then it will enable the correpsonding larb0 clock > automatically by the device link. This patch should be applied before "drm/mediatek: Get rid of mtk_smi_larb_get/put". If before that patch, this patch is a preparation of that patch. If after that patch, this patch is a bug fix of that patch. Why let bug happen? > > Signed-off-by: Yongqiang Niu > Signed-off-by: Yong Wu > --- > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 5 +++++ > drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 5 +++++ > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 18 ++++++++++++++++-- > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 9 +++++++++ > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 + > 5 files changed, 36 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > index c4f07c2..51958cf 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > > #include "mtk_drm_crtc.h" > #include "mtk_drm_ddp_comp.h" > @@ -300,6 +301,8 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) > return ret; > } > > + pm_runtime_enable(dev); > + > ret = component_add(dev, &mtk_disp_ovl_component_ops); > if (ret) > dev_err(dev, "Failed to add component: %d\n", ret); This error should do some error handling to undo pm_runtime_enable(). > @@ -311,6 +314,8 @@ static int mtk_disp_ovl_remove(struct platform_device *pdev) > { > component_del(&pdev->dev, &mtk_disp_ovl_component_ops); > > + pm_runtime_disable(&pdev->dev); > + > return 0; > } > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > index 9a6f0a2..15e5c3a 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > > #include "mtk_drm_crtc.h" > #include "mtk_drm_ddp_comp.h" > @@ -306,6 +307,8 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, priv); > > + pm_runtime_enable(dev); > + > ret = component_add(dev, &mtk_disp_rdma_component_ops); > if (ret) > dev_err(dev, "Failed to add component: %d\n", ret); Ditto. > @@ -317,6 +320,8 @@ static int mtk_disp_rdma_remove(struct platform_device *pdev) > { > component_del(&pdev->dev, &mtk_disp_rdma_component_ops); > > + pm_runtime_disable(&pdev->dev); > + > return 0; > } > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > index c1e891e..daf002e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > @@ -358,13 +358,21 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc, > struct drm_crtc_state *old_state) > { > struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0]; > int ret; > > DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id); > > + ret = pm_runtime_get_sync(comp->dev); > + if (ret < 0) > + DRM_DEV_ERROR(comp->dev, "Failed to enable power domain: %d\n", > + ret); > + > ret = mtk_crtc_ddp_hw_init(mtk_crtc); > - if (ret) > + if (ret) { > + pm_runtime_put(comp->dev); > return; > + } > > drm_crtc_vblank_on(crtc); > mtk_crtc->enabled = true; > @@ -374,7 +382,8 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc, > struct drm_crtc_state *old_state) > { > struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > - int i; > + struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0]; > + int i, ret; > > DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id); > if (!mtk_crtc->enabled) > @@ -398,6 +407,11 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc, > mtk_crtc_ddp_hw_fini(mtk_crtc); > > mtk_crtc->enabled = false; > + > + ret = pm_runtime_put(comp->dev); > + if (ret < 0) > + DRM_DEV_ERROR(comp->dev, "Failed to disable power domain: %d\n", > + ret); > } > > static void mtk_drm_crtc_atomic_begin(struct drm_crtc *crtc, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index 7dc8496..c45e1f0 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > @@ -256,6 +256,8 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node, > struct mtk_ddp_comp *comp, enum mtk_ddp_comp_id comp_id, > const struct mtk_ddp_comp_funcs *funcs) > { > + struct platform_device *comp_pdev; > + > if (comp_id < 0 || comp_id >= DDP_COMPONENT_ID_MAX) > return -EINVAL; > > @@ -282,6 +284,13 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node, > if (IS_ERR(comp->clk)) > return PTR_ERR(comp->clk); > > + comp_pdev = of_find_device_by_node(node); > + if (!comp_pdev) { > + dev_err(dev, "Waiting for device %s\n", node->full_name); > + return -EPROBE_DEFER; > + } > + comp->dev = &comp_pdev->dev; This should be comp->dev = dev; Regards, CK > + > return 0; > } > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > index 108de60..d1838a8 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > @@ -83,6 +83,7 @@ struct mtk_ddp_comp { > struct clk *clk; > void __iomem *regs; > int irq; > + struct device *dev; > enum mtk_ddp_comp_id id; > const struct mtk_ddp_comp_funcs *funcs; > }; From mboxrd@z Thu Jan 1 00:00:00 1970 From: CK Hu Subject: Re: [PATCH v3 12/14] drm/mediatek: Add pm runtime support for ovl and rdma Date: Mon, 16 Sep 2019 15:55:40 +0800 Message-ID: <1568620540.7280.1.camel@mtksdaap41> References: <1567503456-24725-1-git-send-email-yong.wu@mediatek.com> <1567503456-24725-13-git-send-email-yong.wu@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1567503456-24725-13-git-send-email-yong.wu@mediatek.com> Sender: linux-kernel-owner@vger.kernel.org To: Yong Wu Cc: Matthias Brugger , Joerg Roedel , Rob Herring , youlin.pei@mediatek.com, devicetree@vger.kernel.org, Nicolas Boichat , cui.zhang@mediatek.com, srv_heupstream@mediatek.com, chao.hao@mediatek.com, Will Deacon , linux-kernel@vger.kernel.org, Evan Green , Tomasz Figa , iommu@lists.linux-foundation.org, Matthias Kaehlcke , linux-mediatek@lists.infradead.org, Yongqiang Niu , ming-fan.chen@mediatek.com, anan.sun@mediatek.com, Robin Murphy , linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org Hi, Yong: On Tue, 2019-09-03 at 17:37 +0800, Yong Wu wrote: > From: Yongqiang Niu > > Display use the dispsys device to call pm_rumtime_get_sync before. > This patch add pm_runtime_xx with ovl and rdma device which has linked > with larb0, then it will enable the correpsonding larb0 clock > automatically by the device link. This patch should be applied before "drm/mediatek: Get rid of mtk_smi_larb_get/put". If before that patch, this patch is a preparation of that patch. If after that patch, this patch is a bug fix of that patch. Why let bug happen? > > Signed-off-by: Yongqiang Niu > Signed-off-by: Yong Wu > --- > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 5 +++++ > drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 5 +++++ > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 18 ++++++++++++++++-- > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 9 +++++++++ > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 + > 5 files changed, 36 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > index c4f07c2..51958cf 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > > #include "mtk_drm_crtc.h" > #include "mtk_drm_ddp_comp.h" > @@ -300,6 +301,8 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) > return ret; > } > > + pm_runtime_enable(dev); > + > ret = component_add(dev, &mtk_disp_ovl_component_ops); > if (ret) > dev_err(dev, "Failed to add component: %d\n", ret); This error should do some error handling to undo pm_runtime_enable(). > @@ -311,6 +314,8 @@ static int mtk_disp_ovl_remove(struct platform_device *pdev) > { > component_del(&pdev->dev, &mtk_disp_ovl_component_ops); > > + pm_runtime_disable(&pdev->dev); > + > return 0; > } > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > index 9a6f0a2..15e5c3a 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > > #include "mtk_drm_crtc.h" > #include "mtk_drm_ddp_comp.h" > @@ -306,6 +307,8 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, priv); > > + pm_runtime_enable(dev); > + > ret = component_add(dev, &mtk_disp_rdma_component_ops); > if (ret) > dev_err(dev, "Failed to add component: %d\n", ret); Ditto. > @@ -317,6 +320,8 @@ static int mtk_disp_rdma_remove(struct platform_device *pdev) > { > component_del(&pdev->dev, &mtk_disp_rdma_component_ops); > > + pm_runtime_disable(&pdev->dev); > + > return 0; > } > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > index c1e891e..daf002e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > @@ -358,13 +358,21 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc, > struct drm_crtc_state *old_state) > { > struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0]; > int ret; > > DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id); > > + ret = pm_runtime_get_sync(comp->dev); > + if (ret < 0) > + DRM_DEV_ERROR(comp->dev, "Failed to enable power domain: %d\n", > + ret); > + > ret = mtk_crtc_ddp_hw_init(mtk_crtc); > - if (ret) > + if (ret) { > + pm_runtime_put(comp->dev); > return; > + } > > drm_crtc_vblank_on(crtc); > mtk_crtc->enabled = true; > @@ -374,7 +382,8 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc, > struct drm_crtc_state *old_state) > { > struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > - int i; > + struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0]; > + int i, ret; > > DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id); > if (!mtk_crtc->enabled) > @@ -398,6 +407,11 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc, > mtk_crtc_ddp_hw_fini(mtk_crtc); > > mtk_crtc->enabled = false; > + > + ret = pm_runtime_put(comp->dev); > + if (ret < 0) > + DRM_DEV_ERROR(comp->dev, "Failed to disable power domain: %d\n", > + ret); > } > > static void mtk_drm_crtc_atomic_begin(struct drm_crtc *crtc, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index 7dc8496..c45e1f0 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > @@ -256,6 +256,8 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node, > struct mtk_ddp_comp *comp, enum mtk_ddp_comp_id comp_id, > const struct mtk_ddp_comp_funcs *funcs) > { > + struct platform_device *comp_pdev; > + > if (comp_id < 0 || comp_id >= DDP_COMPONENT_ID_MAX) > return -EINVAL; > > @@ -282,6 +284,13 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node, > if (IS_ERR(comp->clk)) > return PTR_ERR(comp->clk); > > + comp_pdev = of_find_device_by_node(node); > + if (!comp_pdev) { > + dev_err(dev, "Waiting for device %s\n", node->full_name); > + return -EPROBE_DEFER; > + } > + comp->dev = &comp_pdev->dev; This should be comp->dev = dev; Regards, CK > + > return 0; > } > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > index 108de60..d1838a8 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > @@ -83,6 +83,7 @@ struct mtk_ddp_comp { > struct clk *clk; > void __iomem *regs; > int irq; > + struct device *dev; > enum mtk_ddp_comp_id id; > const struct mtk_ddp_comp_funcs *funcs; > }; 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=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_SANE_2 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 546F3C4CEC7 for ; Mon, 16 Sep 2019 07:55:48 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (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 25FDE20890 for ; Mon, 16 Sep 2019 07:55:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 25FDE20890 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id D5AF4110C; Mon, 16 Sep 2019 07:55:47 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id A464F1107 for ; Mon, 16 Sep 2019 07:55:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailgw01.mediatek.com (unknown [210.61.82.183]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id E645083A for ; Mon, 16 Sep 2019 07:55:44 +0000 (UTC) X-UUID: cdd2059cd0e84fb58249955718d5a645-20190916 X-UUID: cdd2059cd0e84fb58249955718d5a645-20190916 Received: from mtkcas09.mediatek.inc [(172.21.101.178)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1205137553; Mon, 16 Sep 2019 15:55:42 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 16 Sep 2019 15:55:40 +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; Mon, 16 Sep 2019 15:55:40 +0800 Message-ID: <1568620540.7280.1.camel@mtksdaap41> Subject: Re: [PATCH v3 12/14] drm/mediatek: Add pm runtime support for ovl and rdma From: CK Hu To: Yong Wu Date: Mon, 16 Sep 2019 15:55:40 +0800 In-Reply-To: <1567503456-24725-13-git-send-email-yong.wu@mediatek.com> References: <1567503456-24725-1-git-send-email-yong.wu@mediatek.com> <1567503456-24725-13-git-send-email-yong.wu@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N Cc: youlin.pei@mediatek.com, devicetree@vger.kernel.org, Nicolas Boichat , cui.zhang@mediatek.com, srv_heupstream@mediatek.com, Tomasz Figa , Will Deacon , linux-kernel@vger.kernel.org, Evan Green , chao.hao@mediatek.com, iommu@lists.linux-foundation.org, Rob Herring , linux-mediatek@lists.infradead.org, Yongqiang Niu , Matthias Brugger , ming-fan.chen@mediatek.com, anan.sun@mediatek.com, Robin Murphy , Matthias Kaehlcke , linux-arm-kernel@lists.infradead.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: iommu-bounces@lists.linux-foundation.org Errors-To: iommu-bounces@lists.linux-foundation.org Hi, Yong: On Tue, 2019-09-03 at 17:37 +0800, Yong Wu wrote: > From: Yongqiang Niu > > Display use the dispsys device to call pm_rumtime_get_sync before. > This patch add pm_runtime_xx with ovl and rdma device which has linked > with larb0, then it will enable the correpsonding larb0 clock > automatically by the device link. This patch should be applied before "drm/mediatek: Get rid of mtk_smi_larb_get/put". If before that patch, this patch is a preparation of that patch. If after that patch, this patch is a bug fix of that patch. Why let bug happen? > > Signed-off-by: Yongqiang Niu > Signed-off-by: Yong Wu > --- > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 5 +++++ > drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 5 +++++ > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 18 ++++++++++++++++-- > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 9 +++++++++ > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 + > 5 files changed, 36 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > index c4f07c2..51958cf 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > > #include "mtk_drm_crtc.h" > #include "mtk_drm_ddp_comp.h" > @@ -300,6 +301,8 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) > return ret; > } > > + pm_runtime_enable(dev); > + > ret = component_add(dev, &mtk_disp_ovl_component_ops); > if (ret) > dev_err(dev, "Failed to add component: %d\n", ret); This error should do some error handling to undo pm_runtime_enable(). > @@ -311,6 +314,8 @@ static int mtk_disp_ovl_remove(struct platform_device *pdev) > { > component_del(&pdev->dev, &mtk_disp_ovl_component_ops); > > + pm_runtime_disable(&pdev->dev); > + > return 0; > } > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > index 9a6f0a2..15e5c3a 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > > #include "mtk_drm_crtc.h" > #include "mtk_drm_ddp_comp.h" > @@ -306,6 +307,8 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, priv); > > + pm_runtime_enable(dev); > + > ret = component_add(dev, &mtk_disp_rdma_component_ops); > if (ret) > dev_err(dev, "Failed to add component: %d\n", ret); Ditto. > @@ -317,6 +320,8 @@ static int mtk_disp_rdma_remove(struct platform_device *pdev) > { > component_del(&pdev->dev, &mtk_disp_rdma_component_ops); > > + pm_runtime_disable(&pdev->dev); > + > return 0; > } > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > index c1e891e..daf002e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > @@ -358,13 +358,21 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc, > struct drm_crtc_state *old_state) > { > struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0]; > int ret; > > DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id); > > + ret = pm_runtime_get_sync(comp->dev); > + if (ret < 0) > + DRM_DEV_ERROR(comp->dev, "Failed to enable power domain: %d\n", > + ret); > + > ret = mtk_crtc_ddp_hw_init(mtk_crtc); > - if (ret) > + if (ret) { > + pm_runtime_put(comp->dev); > return; > + } > > drm_crtc_vblank_on(crtc); > mtk_crtc->enabled = true; > @@ -374,7 +382,8 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc, > struct drm_crtc_state *old_state) > { > struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > - int i; > + struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0]; > + int i, ret; > > DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id); > if (!mtk_crtc->enabled) > @@ -398,6 +407,11 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc, > mtk_crtc_ddp_hw_fini(mtk_crtc); > > mtk_crtc->enabled = false; > + > + ret = pm_runtime_put(comp->dev); > + if (ret < 0) > + DRM_DEV_ERROR(comp->dev, "Failed to disable power domain: %d\n", > + ret); > } > > static void mtk_drm_crtc_atomic_begin(struct drm_crtc *crtc, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index 7dc8496..c45e1f0 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > @@ -256,6 +256,8 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node, > struct mtk_ddp_comp *comp, enum mtk_ddp_comp_id comp_id, > const struct mtk_ddp_comp_funcs *funcs) > { > + struct platform_device *comp_pdev; > + > if (comp_id < 0 || comp_id >= DDP_COMPONENT_ID_MAX) > return -EINVAL; > > @@ -282,6 +284,13 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node, > if (IS_ERR(comp->clk)) > return PTR_ERR(comp->clk); > > + comp_pdev = of_find_device_by_node(node); > + if (!comp_pdev) { > + dev_err(dev, "Waiting for device %s\n", node->full_name); > + return -EPROBE_DEFER; > + } > + comp->dev = &comp_pdev->dev; This should be comp->dev = dev; Regards, CK > + > return 0; > } > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > index 108de60..d1838a8 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > @@ -83,6 +83,7 @@ struct mtk_ddp_comp { > struct clk *clk; > void __iomem *regs; > int irq; > + struct device *dev; > enum mtk_ddp_comp_id id; > const struct mtk_ddp_comp_funcs *funcs; > }; _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu 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=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_2 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 BE634C49ED7 for ; Mon, 16 Sep 2019 07:56:03 +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 9144C20650 for ; Mon, 16 Sep 2019 07:56:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="OrK/KzAo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9144C20650 Authentication-Results: mail.kernel.org; dmarc=fail (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=675RvWpFyoIwMfASzpPiHw7mLkm3iSI9r1GlkpoIVv4=; b=OrK/KzAobyGSUN 39NvlfBWsh6eOpAjuDLrSIqcIKsPQybhGhx2JJFHWAE0cbrGgg1iYuqt1nzMMDuM07NOmzwtJL8Y+ ZZdsMVvFuFtJHi3Z+rptk6EfjGI/i23mYRi7rC/jft+e/YmCE6c2vv91BjxR2n9yUJ7fJDpmWfsZI tfz+bhH1HTdpYjC6plnNIzK/VrAff5mVnusvWa7bFLHepgJ+vD3389rJMP5ixtS/OWle+K+TenN0e 8O4w/h1WZUCZNM8e0Oewn1c89fo2dBPy6yU1q3RQrQeg2Uobbz9kAWsl6l7Gg4bS9wgd001JMveUm V1bakgpi3LUQCQ5ZAOAQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1i9lrV-0002cF-QP; Mon, 16 Sep 2019 07:55:53 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1i9lrS-0002bE-6S; Mon, 16 Sep 2019 07:55:51 +0000 X-UUID: 522624b7f65241438522ec780c06801d-20190915 X-UUID: 522624b7f65241438522ec780c06801d-20190915 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 254404354; Sun, 15 Sep 2019 23:55:43 -0800 Received: from MTKMBS07N2.mediatek.inc (172.21.101.141) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 16 Sep 2019 00:55:42 -0700 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 16 Sep 2019 15:55:40 +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; Mon, 16 Sep 2019 15:55:40 +0800 Message-ID: <1568620540.7280.1.camel@mtksdaap41> Subject: Re: [PATCH v3 12/14] drm/mediatek: Add pm runtime support for ovl and rdma From: CK Hu To: Yong Wu Date: Mon, 16 Sep 2019 15:55:40 +0800 In-Reply-To: <1567503456-24725-13-git-send-email-yong.wu@mediatek.com> References: <1567503456-24725-1-git-send-email-yong.wu@mediatek.com> <1567503456-24725-13-git-send-email-yong.wu@mediatek.com> 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-20190916_005550_247190_20E53016 X-CRM114-Status: GOOD ( 20.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: youlin.pei@mediatek.com, devicetree@vger.kernel.org, Nicolas Boichat , cui.zhang@mediatek.com, srv_heupstream@mediatek.com, Tomasz Figa , Joerg Roedel , Will Deacon , linux-kernel@vger.kernel.org, Evan Green , chao.hao@mediatek.com, iommu@lists.linux-foundation.org, Rob Herring , linux-mediatek@lists.infradead.org, Yongqiang Niu , Matthias Brugger , ming-fan.chen@mediatek.com, anan.sun@mediatek.com, Robin Murphy , Matthias Kaehlcke , 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, Yong: On Tue, 2019-09-03 at 17:37 +0800, Yong Wu wrote: > From: Yongqiang Niu > > Display use the dispsys device to call pm_rumtime_get_sync before. > This patch add pm_runtime_xx with ovl and rdma device which has linked > with larb0, then it will enable the correpsonding larb0 clock > automatically by the device link. This patch should be applied before "drm/mediatek: Get rid of mtk_smi_larb_get/put". If before that patch, this patch is a preparation of that patch. If after that patch, this patch is a bug fix of that patch. Why let bug happen? > > Signed-off-by: Yongqiang Niu > Signed-off-by: Yong Wu > --- > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 5 +++++ > drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 5 +++++ > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 18 ++++++++++++++++-- > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 9 +++++++++ > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 + > 5 files changed, 36 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > index c4f07c2..51958cf 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > > #include "mtk_drm_crtc.h" > #include "mtk_drm_ddp_comp.h" > @@ -300,6 +301,8 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) > return ret; > } > > + pm_runtime_enable(dev); > + > ret = component_add(dev, &mtk_disp_ovl_component_ops); > if (ret) > dev_err(dev, "Failed to add component: %d\n", ret); This error should do some error handling to undo pm_runtime_enable(). > @@ -311,6 +314,8 @@ static int mtk_disp_ovl_remove(struct platform_device *pdev) > { > component_del(&pdev->dev, &mtk_disp_ovl_component_ops); > > + pm_runtime_disable(&pdev->dev); > + > return 0; > } > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > index 9a6f0a2..15e5c3a 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > > #include "mtk_drm_crtc.h" > #include "mtk_drm_ddp_comp.h" > @@ -306,6 +307,8 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, priv); > > + pm_runtime_enable(dev); > + > ret = component_add(dev, &mtk_disp_rdma_component_ops); > if (ret) > dev_err(dev, "Failed to add component: %d\n", ret); Ditto. > @@ -317,6 +320,8 @@ static int mtk_disp_rdma_remove(struct platform_device *pdev) > { > component_del(&pdev->dev, &mtk_disp_rdma_component_ops); > > + pm_runtime_disable(&pdev->dev); > + > return 0; > } > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > index c1e891e..daf002e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > @@ -358,13 +358,21 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc, > struct drm_crtc_state *old_state) > { > struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > + struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0]; > int ret; > > DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id); > > + ret = pm_runtime_get_sync(comp->dev); > + if (ret < 0) > + DRM_DEV_ERROR(comp->dev, "Failed to enable power domain: %d\n", > + ret); > + > ret = mtk_crtc_ddp_hw_init(mtk_crtc); > - if (ret) > + if (ret) { > + pm_runtime_put(comp->dev); > return; > + } > > drm_crtc_vblank_on(crtc); > mtk_crtc->enabled = true; > @@ -374,7 +382,8 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc, > struct drm_crtc_state *old_state) > { > struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > - int i; > + struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0]; > + int i, ret; > > DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id); > if (!mtk_crtc->enabled) > @@ -398,6 +407,11 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc, > mtk_crtc_ddp_hw_fini(mtk_crtc); > > mtk_crtc->enabled = false; > + > + ret = pm_runtime_put(comp->dev); > + if (ret < 0) > + DRM_DEV_ERROR(comp->dev, "Failed to disable power domain: %d\n", > + ret); > } > > static void mtk_drm_crtc_atomic_begin(struct drm_crtc *crtc, > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index 7dc8496..c45e1f0 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > @@ -256,6 +256,8 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node, > struct mtk_ddp_comp *comp, enum mtk_ddp_comp_id comp_id, > const struct mtk_ddp_comp_funcs *funcs) > { > + struct platform_device *comp_pdev; > + > if (comp_id < 0 || comp_id >= DDP_COMPONENT_ID_MAX) > return -EINVAL; > > @@ -282,6 +284,13 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node, > if (IS_ERR(comp->clk)) > return PTR_ERR(comp->clk); > > + comp_pdev = of_find_device_by_node(node); > + if (!comp_pdev) { > + dev_err(dev, "Waiting for device %s\n", node->full_name); > + return -EPROBE_DEFER; > + } > + comp->dev = &comp_pdev->dev; This should be comp->dev = dev; Regards, CK > + > return 0; > } > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > index 108de60..d1838a8 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > @@ -83,6 +83,7 @@ struct mtk_ddp_comp { > struct clk *clk; > void __iomem *regs; > int irq; > + struct device *dev; > enum mtk_ddp_comp_id id; > const struct mtk_ddp_comp_funcs *funcs; > }; _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel