From: xinlei lee xinlei.lee@mediatek.com
The modification is based on avoiding screen shift: https://patchwork.kernel.org/project/linux-mediatek/cover/20220114092110.121...
xinlei lee (3): dt-bindings: display: mediatek: dsi: add documentation for MT8186 SoC drm/mediatek: Add mt8186 dsi compatible to mtk_dsi.c drm/mediatek: Move the getting bridge node function to mtk_dsi_bind
.../bindings/display/mediatek/mediatek,dsi.txt | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 37 ++++++++++++++-------- 2 files changed, 24 insertions(+), 15 deletions(-)
From: xinlei lee xinlei.lee@mediatek.com
Add binding documentation for the MT8186 SoC.
Signed-off-by: Xinlei Lee xinlei.lee@mediatek.com --- Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt index 36b0145..c82b8b2 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt @@ -7,7 +7,7 @@ channel output.
Required properties: - compatible: "mediatek,<chip>-dsi" -- the supported chips are mt2701, mt7623, mt8167, mt8173 and mt8183. +- the supported chips are mt2701, mt7623, mt8167, mt8173, mt8183 and mt8186. - reg: Physical base address and length of the controller's registers - interrupts: The interrupt signal from the function block. - clocks: device clocks
Hi, Xinlei:
On Thu, 2022-01-27 at 19:42 +0800, xinlei.lee@mediatek.com wrote:
From: xinlei lee xinlei.lee@mediatek.com
Add binding documentation for the MT8186 SoC.
DPI has a yaml format document, so I would like DSI also has a yaml format document. Please send a patch to transfer DSI document to yaml, and then apply this patch to yaml document.
Regards, CK
Signed-off-by: Xinlei Lee xinlei.lee@mediatek.com
Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt b/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt index 36b0145..c82b8b2 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt @@ -7,7 +7,7 @@ channel output.
Required properties:
- compatible: "mediatek,<chip>-dsi"
-- the supported chips are mt2701, mt7623, mt8167, mt8173 and mt8183. +- the supported chips are mt2701, mt7623, mt8167, mt8173, mt8183 and mt8186.
- reg: Physical base address and length of the controller's
registers
- interrupts: The interrupt signal from the function block.
- clocks: device clocks
On Fri, 2022-01-28 at 13:08 +0800, CK Hu wrote:
Hi, Xinlei:
On Thu, 2022-01-27 at 19:42 +0800, xinlei.lee@mediatek.com wrote:
From: xinlei lee xinlei.lee@mediatek.com
Add binding documentation for the MT8186 SoC.
DPI has a yaml format document, so I would like DSI also has a yaml format document. Please send a patch to transfer DSI document to yaml, and then apply this patch to yaml document.
Regards, CK
Hi, CK:
I have prepared DSI document to yaml, and will sent it out in the next edition. Thanks for your suggestion.
Best Regards! xinlei
Signed-off-by: Xinlei Lee xinlei.lee@mediatek.com
Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.tx t
2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.t xt b/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.t xt index 36b0145..c82b8b2 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.t xt +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.t xt @@ -7,7 +7,7 @@ channel output.
Required properties:
- compatible: "mediatek,<chip>-dsi"
-- the supported chips are mt2701, mt7623, mt8167, mt8173 and mt8183. +- the supported chips are mt2701, mt7623, mt8167, mt8173, mt8183 and mt8186.
- reg: Physical base address and length of the controller's
registers
- interrupts: The interrupt signal from the function block.
- clocks: device clocks
From: xinlei lee xinlei.lee@mediatek.com
Add the compatible of mt8186-dsi because we use different cmdq addresses in mt8186.
Signed-off-by: Xinlei Lee xinlei.lee@mediatek.com --- drivers/gpu/drm/mediatek/mtk_dsi.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index e91b3ff..62af60d 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -1151,6 +1151,12 @@ static const struct mtk_dsi_driver_data mt8183_dsi_driver_data = { .has_size_ctl = true, };
+static const struct mtk_dsi_driver_data mt8186_dsi_driver_data = { + .reg_cmdq_off = 0xd00, + .has_shadow_ctl = true, + .has_size_ctl = true, +}; + static const struct of_device_id mtk_dsi_of_match[] = { { .compatible = "mediatek,mt2701-dsi", .data = &mt2701_dsi_driver_data }, @@ -1158,6 +1164,8 @@ static const struct of_device_id mtk_dsi_of_match[] = { .data = &mt8173_dsi_driver_data }, { .compatible = "mediatek,mt8183-dsi", .data = &mt8183_dsi_driver_data }, + { .compatible = "mediatek,mt8186-dsi", + .data = &mt8186_dsi_driver_data }, { }, }; MODULE_DEVICE_TABLE(of, mtk_dsi_of_match);
Hi, Xinlei:
On Thu, 2022-01-27 at 19:42 +0800, xinlei.lee@mediatek.com wrote:
From: xinlei lee xinlei.lee@mediatek.com
Add the compatible of mt8186-dsi because we use different cmdq addresses in mt8186.
Reviewed-by: CK Hu ck.hu@mediatek.com
Signed-off-by: Xinlei Lee xinlei.lee@mediatek.com
drivers/gpu/drm/mediatek/mtk_dsi.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index e91b3ff..62af60d 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -1151,6 +1151,12 @@ static const struct mtk_dsi_driver_data mt8183_dsi_driver_data = { .has_size_ctl = true, };
+static const struct mtk_dsi_driver_data mt8186_dsi_driver_data = {
- .reg_cmdq_off = 0xd00,
- .has_shadow_ctl = true,
- .has_size_ctl = true,
+};
static const struct of_device_id mtk_dsi_of_match[] = { { .compatible = "mediatek,mt2701-dsi", .data = &mt2701_dsi_driver_data }, @@ -1158,6 +1164,8 @@ static const struct of_device_id mtk_dsi_of_match[] = { .data = &mt8173_dsi_driver_data }, { .compatible = "mediatek,mt8183-dsi", .data = &mt8183_dsi_driver_data },
- { .compatible = "mediatek,mt8186-dsi",
{ },.data = &mt8186_dsi_driver_data },
}; MODULE_DEVICE_TABLE(of, mtk_dsi_of_match);
From: xinlei lee xinlei.lee@mediatek.com
The order of probe function for bridge drivers and dsi drivers is uncertain. To avoid the dsi probe cannot be executed, we place getting bridge node function in mtk_dsi_bind.
Signed-off-by:Xinlei Lee xinlei.lee@mediatek.com --- drivers/gpu/drm/mediatek/mtk_dsi.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index 62af60d..a390f26 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -991,6 +991,21 @@ static int mtk_dsi_bind(struct device *dev, struct device *master, void *data) int ret; struct drm_device *drm = data; struct mtk_dsi *dsi = dev_get_drvdata(dev); + struct drm_panel *panel; + + ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, + &panel, &dsi->next_bridge); + if (ret) + return ret; + + if (panel) { + dsi->next_bridge = devm_drm_panel_bridge_add(dev, panel); + if (IS_ERR(dsi->next_bridge)) { + ret = PTR_ERR(dsi->next_bridge); + dev_err(dev, "failed to add bridge: %d\n", ret); + return ret; + } + }
ret = mtk_dsi_encoder_init(drm, dsi); if (ret) @@ -1016,7 +1031,6 @@ static int mtk_dsi_probe(struct platform_device *pdev) { struct mtk_dsi *dsi; struct device *dev = &pdev->dev; - struct drm_panel *panel; struct resource *regs; int irq_num; int ret; @@ -1033,19 +1047,6 @@ static int mtk_dsi_probe(struct platform_device *pdev) return ret; }
- ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0, - &panel, &dsi->next_bridge); - if (ret) - goto err_unregister_host; - - if (panel) { - dsi->next_bridge = devm_drm_panel_bridge_add(dev, panel); - if (IS_ERR(dsi->next_bridge)) { - ret = PTR_ERR(dsi->next_bridge); - goto err_unregister_host; - } - } - dsi->driver_data = of_device_get_match_data(dev);
dsi->engine_clk = devm_clk_get(dev, "engine");
Hi, Xinlei:
On Thu, 2022-01-27 at 19:42 +0800, xinlei.lee@mediatek.com wrote:
From: xinlei lee xinlei.lee@mediatek.com
The order of probe function for bridge drivers and dsi drivers is uncertain. To avoid the dsi probe cannot be executed, we place getting bridge node function in mtk_dsi_bind.
It seems this patch want to fix the same problem as [1]. Does [1] fix your problem? If so, let's ignore this patch.
[1] https://patchwork.kernel.org/project/linux-mediatek/patch/20220127143623.123...
Regards, CK
Signed-off-by:Xinlei Lee xinlei.lee@mediatek.com
drivers/gpu/drm/mediatek/mtk_dsi.c | 29 +++++++++++++++-------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index 62af60d..a390f26 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -991,6 +991,21 @@ static int mtk_dsi_bind(struct device *dev, struct device *master, void *data) int ret; struct drm_device *drm = data; struct mtk_dsi *dsi = dev_get_drvdata(dev);
- struct drm_panel *panel;
- ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
&panel, &dsi->next_bridge);
- if (ret)
return ret;
- if (panel) {
dsi->next_bridge = devm_drm_panel_bridge_add(dev,
panel);
if (IS_ERR(dsi->next_bridge)) {
ret = PTR_ERR(dsi->next_bridge);
dev_err(dev, "failed to add bridge: %d\n",
ret);
return ret;
}
}
ret = mtk_dsi_encoder_init(drm, dsi); if (ret)
@@ -1016,7 +1031,6 @@ static int mtk_dsi_probe(struct platform_device *pdev) { struct mtk_dsi *dsi; struct device *dev = &pdev->dev;
- struct drm_panel *panel; struct resource *regs; int irq_num; int ret;
@@ -1033,19 +1047,6 @@ static int mtk_dsi_probe(struct platform_device *pdev) return ret; }
- ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
&panel, &dsi->next_bridge);
- if (ret)
goto err_unregister_host;
- if (panel) {
dsi->next_bridge = devm_drm_panel_bridge_add(dev,
panel);
if (IS_ERR(dsi->next_bridge)) {
ret = PTR_ERR(dsi->next_bridge);
goto err_unregister_host;
}
}
dsi->driver_data = of_device_get_match_data(dev);
dsi->engine_clk = devm_clk_get(dev, "engine");
Hi, CK:
As you describe, these two patches modify the same thing, let's ignore this patch. Thanks for your suggestion.
Best Regards, xinlei
-----邮件原件----- 发件人: CK Hu [mailto:ck.hu@mediatek.com] 发送时间: 2022年1月28日 13:04 收件人: Xinlei Lee (李昕磊); chunkuang.hu@kernel.org; p.zabel@pengutronix.de; airlied@linux.ie; daniel@ffwll.ch; matthias.bgg@gmail.com 抄送: dri-devel@lists.freedesktop.org; linux-mediatek@lists.infradead.org; linux-arm-kernel@lists.infradead.org; srv_heupstream; linux-kernel@vger.kernel.org; Jitao Shi (石记涛) 主题: Re: [v1, 3/3] drm/mediatek: Move the getting bridge node function to mtk_dsi_bind
Hi, Xinlei:
On Thu, 2022-01-27 at 19:42 +0800, xinlei.lee@mediatek.com wrote:
From: xinlei lee xinlei.lee@mediatek.com
The order of probe function for bridge drivers and dsi drivers is uncertain. To avoid the dsi probe cannot be executed, we place getting bridge node function in mtk_dsi_bind.
It seems this patch want to fix the same problem as [1]. Does [1] fix your problem? If so, let's ignore this patch.
[1] https://patchwork.kernel.org/project/linux-mediatek/patch/20220127143623.123...
Regards, CK
Signed-off-by:Xinlei Lee xinlei.lee@mediatek.com
drivers/gpu/drm/mediatek/mtk_dsi.c | 29 +++++++++++++++-------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index 62af60d..a390f26 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -991,6 +991,21 @@ static int mtk_dsi_bind(struct device *dev, struct device *master, void *data) int ret; struct drm_device *drm = data; struct mtk_dsi *dsi = dev_get_drvdata(dev);
- struct drm_panel *panel;
- ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
&panel, &dsi->next_bridge);
- if (ret)
return ret;
- if (panel) {
dsi->next_bridge = devm_drm_panel_bridge_add(dev,
panel);
if (IS_ERR(dsi->next_bridge)) {
ret = PTR_ERR(dsi->next_bridge);
dev_err(dev, "failed to add bridge: %d\n",
ret);
return ret;
}
}
ret = mtk_dsi_encoder_init(drm, dsi); if (ret)
@@ -1016,7 +1031,6 @@ static int mtk_dsi_probe(struct platform_device *pdev) { struct mtk_dsi *dsi; struct device *dev = &pdev->dev;
- struct drm_panel *panel; struct resource *regs; int irq_num; int ret;
@@ -1033,19 +1047,6 @@ static int mtk_dsi_probe(struct platform_device *pdev) return ret; }
- ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
&panel, &dsi->next_bridge);
- if (ret)
goto err_unregister_host;
- if (panel) {
dsi->next_bridge = devm_drm_panel_bridge_add(dev,
panel);
if (IS_ERR(dsi->next_bridge)) {
ret = PTR_ERR(dsi->next_bridge);
goto err_unregister_host;
}
}
dsi->driver_data = of_device_get_match_data(dev);
dsi->engine_clk = devm_clk_get(dev, "engine");
On Fri, 2022-01-28 at 13:03 +0800, CK Hu wrote:
Hi, Xinlei:
On Thu, 2022-01-27 at 19:42 +0800, xinlei.lee@mediatek.com wrote:
From: xinlei lee xinlei.lee@mediatek.com
The order of probe function for bridge drivers and dsi drivers is uncertain. To avoid the dsi probe cannot be executed, we place getting bridge node function in mtk_dsi_bind.
It seems this patch want to fix the same problem as [1]. Does [1] fix your problem? If so, let's ignore this patch.
[1]
https://patchwork.kernel.org/project/linux-mediatek/patch/20220127143623.123...
Regards, CK
Hi, CK:
As you describe,these two patches modify the same thing,we can ignore this patch. Thanks for your suggestion.
Best Regards! xinlei
Signed-off-by:Xinlei Lee xinlei.lee@mediatek.com
drivers/gpu/drm/mediatek/mtk_dsi.c | 29 +++++++++++++++-----------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index 62af60d..a390f26 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -991,6 +991,21 @@ static int mtk_dsi_bind(struct device *dev, struct device *master, void *data) int ret; struct drm_device *drm = data; struct mtk_dsi *dsi = dev_get_drvdata(dev);
- struct drm_panel *panel;
- ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
&panel, &dsi->next_bridge);
- if (ret)
return ret;
- if (panel) {
dsi->next_bridge = devm_drm_panel_bridge_add(dev,
panel);
if (IS_ERR(dsi->next_bridge)) {
ret = PTR_ERR(dsi->next_bridge);
dev_err(dev, "failed to add bridge: %d\n",
ret);
return ret;
}
}
ret = mtk_dsi_encoder_init(drm, dsi); if (ret)
@@ -1016,7 +1031,6 @@ static int mtk_dsi_probe(struct platform_device *pdev) { struct mtk_dsi *dsi; struct device *dev = &pdev->dev;
- struct drm_panel *panel; struct resource *regs; int irq_num; int ret;
@@ -1033,19 +1047,6 @@ static int mtk_dsi_probe(struct platform_device *pdev) return ret; }
- ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
&panel, &dsi->next_bridge);
- if (ret)
goto err_unregister_host;
- if (panel) {
dsi->next_bridge = devm_drm_panel_bridge_add(dev,
panel);
if (IS_ERR(dsi->next_bridge)) {
ret = PTR_ERR(dsi->next_bridge);
goto err_unregister_host;
}
}
dsi->driver_data = of_device_get_match_data(dev);
dsi->engine_clk = devm_clk_get(dev, "engine");
dri-devel@lists.freedesktop.org