On Tue, 2019-06-18 at 14:35 +0800, CK Hu wrote:
> Hi, Yong:
>
> On Mon, 2019-06-10 at 20:55 +0800, Yong Wu wrote:
> > MediaTek IOMMU has already added the device_link between the consumer
> > and smi-larb device. If the drm device call the pm_runtime_get_sync,
> > the smi-larb's pm_runtime_get_sync also be called automatically.
> >
> > CC: CK Hu <ck.hu@xxxxxxxxxxxx>
> > CC: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
> > Signed-off-by: Yong Wu <yong.wu@xxxxxxxxxxxx>
> > Reviewed-by: Evan Green <evgreen@xxxxxxxxxxxx>
> > ---
> > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 11 -----------
> > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 26 --------------------------
> > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 -
> > 3 files changed, 38 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > index acad088..3a21a48 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > @@ -18,7 +18,6 @@
> > #include <drm/drm_probe_helper.h>
> > #include <linux/clk.h>
> > #include <linux/pm_runtime.h>
> > -#include <soc/mediatek/smi.h>
> >
> > #include "mtk_drm_drv.h"
> > #include "mtk_drm_crtc.h"
> > @@ -371,20 +370,12 @@ 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 = mtk_smi_larb_get(comp->larb_dev);
> > - if (ret) {
> > - DRM_ERROR("Failed to get larb: %d\n", ret);
> > - return;
> > - }
> > -
> > ret = mtk_crtc_ddp_hw_init(mtk_crtc);
> > if (ret) {
> > - mtk_smi_larb_put(comp->larb_dev);
> > return;
> > }
>
> Remove {}.
Thanks. I will fix in next version.
>
> Regards,
> CK
>
> >
> > @@ -396,7 +387,6 @@ 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);
> > - struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
> > int i;
> >
> > DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id);
> > @@ -419,7 +409,6 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
> >
> > drm_crtc_vblank_off(crtc);
> > mtk_crtc_ddp_hw_fini(mtk_crtc);
> > - mtk_smi_larb_put(comp->larb_dev);
> >
> > mtk_crtc->enabled = false;
> > }
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> > index 54ca794..ede15c9 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> > @@ -265,8 +265,6 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node,
> > const struct mtk_ddp_comp_funcs *funcs)
> > {
> > enum mtk_ddp_comp_type type;
> > - struct device_node *larb_node;
> > - struct platform_device *larb_pdev;
> >
> > if (comp_id < 0 || comp_id >= DDP_COMPONENT_ID_MAX)
> > return -EINVAL;
> > @@ -296,30 +294,6 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node,
> > if (IS_ERR(comp->clk))
> > return PTR_ERR(comp->clk);
> >
> > - /* Only DMA capable components need the LARB property */
> > - comp->larb_dev = NULL;
> > - if (type != MTK_DISP_OVL &&
> > - type != MTK_DISP_RDMA &&
> > - type != MTK_DISP_WDMA)
> > - return 0;
> > -
> > - larb_node = of_parse_phandle(node, "mediatek,larb", 0);
> > - if (!larb_node) {
> > - dev_err(dev,
> > - "Missing mediadek,larb phandle in %pOF node\n", node);
> > - return -EINVAL;
> > - }
> > -
> > - larb_pdev = of_find_device_by_node(larb_node);
> > - if (!larb_pdev) {
> > - dev_warn(dev, "Waiting for larb device %pOF\n", larb_node);
> > - of_node_put(larb_node);
> > - return -EPROBE_DEFER;
> > - }
> > - of_node_put(larb_node);
> > -
> > - comp->larb_dev = &larb_pdev->dev;
> > -
> > 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 8399229..b8dc17e 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > @@ -91,7 +91,6 @@ struct mtk_ddp_comp {
> > struct clk *clk;
> > void __iomem *regs;
> > int irq;
> > - struct device *larb_dev;
> > enum mtk_ddp_comp_id id;
> > const struct mtk_ddp_comp_funcs *funcs;
> > };
>
>
