From: Xinlei Lee xinlei.lee@mediatek.com
Base on 5.18-rc1
Change since v3: 1. Move mt8186_conf location.
Change since v2: 1. Move mt8186 compatiable location.
Change since v1: 1. Put switch dpi Topckgen MUX action in mt8186.dtsi.
Xinlei Lee (2): dt-bindings: display: mediatek: dpi: Add compatible for MediaTek MT8186 drm/mediatek: Add mt8186 dpi compatible to mtk_dpi.c
.../bindings/display/mediatek/mediatek,dpi.yaml | 1 + drivers/gpu/drm/mediatek/mtk_dpi.c | 11 +++++++++++ 2 files changed, 12 insertions(+)
From: Xinlei Lee xinlei.lee@mediatek.com
Add dt-binding documentation of dpi for MediaTek MT8186 SoC.
Signed-off-by: Xinlei Lee xinlei.lee@mediatek.com Reviewed-by: Rex-BC Chen rex-bc.chen@mediatek.com Acked-by: Rob Herring robh@kernel.org --- .../devicetree/bindings/display/mediatek/mediatek,dpi.yaml | 1 + 1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml index 843f89d6053f..77ee1b923991 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml @@ -22,6 +22,7 @@ properties: - mediatek,mt7623-dpi - mediatek,mt8173-dpi - mediatek,mt8183-dpi + - mediatek,mt8186-dpi - mediatek,mt8192-dpi
reg:
From: Xinlei Lee xinlei.lee@mediatek.com
Add the compatible because use different .data in mt8186.
Signed-off-by: Xinlei Lee xinlei.lee@mediatek.com --- drivers/gpu/drm/mediatek/mtk_dpi.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index 4554e2de1430..824d7da41c6a 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -815,6 +815,14 @@ static const struct mtk_dpi_conf mt8183_conf = { .num_output_fmts = ARRAY_SIZE(mt8183_output_fmts), };
+static const struct mtk_dpi_conf mt8186_conf = { + .cal_factor = mt8183_calculate_factor, + .reg_h_fre_con = 0xe0, + .max_clock_khz = 150000, + .output_fmts = mt8183_output_fmts, + .num_output_fmts = ARRAY_SIZE(mt8183_output_fmts), +}; + static const struct mtk_dpi_conf mt8192_conf = { .cal_factor = mt8183_calculate_factor, .reg_h_fre_con = 0xe0, @@ -942,6 +950,9 @@ static const struct of_device_id mtk_dpi_of_ids[] = { { .compatible = "mediatek,mt8183-dpi", .data = &mt8183_conf, }, + { .compatible = "mediatek,mt8186-dpi", + .data = &mt8186_conf, + }, { .compatible = "mediatek,mt8192-dpi", .data = &mt8192_conf, },
On Mon, 2022-04-11 at 10:53 +0800, xinlei.lee@mediatek.com wrote:
From: Xinlei Lee xinlei.lee@mediatek.com
Add the compatible because use different .data in mt8186.
Signed-off-by: Xinlei Lee xinlei.lee@mediatek.com
drivers/gpu/drm/mediatek/mtk_dpi.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index 4554e2de1430..824d7da41c6a 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -815,6 +815,14 @@ static const struct mtk_dpi_conf mt8183_conf = { .num_output_fmts = ARRAY_SIZE(mt8183_output_fmts), };
+static const struct mtk_dpi_conf mt8186_conf = {
- .cal_factor = mt8183_calculate_factor,
- .reg_h_fre_con = 0xe0,
- .max_clock_khz = 150000,
- .output_fmts = mt8183_output_fmts,
- .num_output_fmts = ARRAY_SIZE(mt8183_output_fmts),
+};
static const struct mtk_dpi_conf mt8192_conf = { .cal_factor = mt8183_calculate_factor, .reg_h_fre_con = 0xe0, @@ -942,6 +950,9 @@ static const struct of_device_id mtk_dpi_of_ids[] = { { .compatible = "mediatek,mt8183-dpi", .data = &mt8183_conf, },
- { .compatible = "mediatek,mt8186-dpi",
.data = &mt8186_conf,- }, { .compatible = "mediatek,mt8192-dpi", .data = &mt8192_conf, },
Reviewed-by: Rex-BC Chen rex-bc.chen@mediatek.com
Hi, Xinlei:
On Mon, 2022-04-11 at 10:53 +0800, xinlei.lee@mediatek.com wrote:
From: Xinlei Lee xinlei.lee@mediatek.com
Add the compatible because use different .data in mt8186.
Signed-off-by: Xinlei Lee xinlei.lee@mediatek.com
drivers/gpu/drm/mediatek/mtk_dpi.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index 4554e2de1430..824d7da41c6a 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -815,6 +815,14 @@ static const struct mtk_dpi_conf mt8183_conf = { .num_output_fmts = ARRAY_SIZE(mt8183_output_fmts), };
+static const struct mtk_dpi_conf mt8186_conf = {
- .cal_factor = mt8183_calculate_factor,
- .reg_h_fre_con = 0xe0,
- .max_clock_khz = 150000,
- .output_fmts = mt8183_output_fmts,
- .num_output_fmts = ARRAY_SIZE(mt8183_output_fmts),
+};
static const struct mtk_dpi_conf mt8192_conf = { .cal_factor = mt8183_calculate_factor, .reg_h_fre_con = 0xe0, @@ -942,6 +950,9 @@ static const struct of_device_id mtk_dpi_of_ids[] = { { .compatible = "mediatek,mt8183-dpi", .data = &mt8183_conf, },
- { .compatible = "mediatek,mt8186-dpi",
.data = &mt8186_conf,
If Nicolas' patch [1] is correct, this should be
.data = &mt8192_conf,
Could you help to comfirm patch [1] is correct or not?
[1] https://patchwork.kernel.org/project/linux-mediatek/patch/20220408013950.674...
Regards, CK
- }, { .compatible = "mediatek,mt8192-dpi", .data = &mt8192_conf, },
On Tue, 2022-04-12 at 16:20 +0800, CK Hu wrote:
Hi, Xinlei:
On Mon, 2022-04-11 at 10:53 +0800, xinlei.lee@mediatek.com wrote:
From: Xinlei Lee xinlei.lee@mediatek.com
Add the compatible because use different .data in mt8186.
Signed-off-by: Xinlei Lee xinlei.lee@mediatek.com
drivers/gpu/drm/mediatek/mtk_dpi.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index 4554e2de1430..824d7da41c6a 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -815,6 +815,14 @@ static const struct mtk_dpi_conf mt8183_conf = { .num_output_fmts = ARRAY_SIZE(mt8183_output_fmts), };
+static const struct mtk_dpi_conf mt8186_conf = {
- .cal_factor = mt8183_calculate_factor,
- .reg_h_fre_con = 0xe0,
- .max_clock_khz = 150000,
- .output_fmts = mt8183_output_fmts,
- .num_output_fmts = ARRAY_SIZE(mt8183_output_fmts),
+};
static const struct mtk_dpi_conf mt8192_conf = { .cal_factor = mt8183_calculate_factor, .reg_h_fre_con = 0xe0, @@ -942,6 +950,9 @@ static const struct of_device_id mtk_dpi_of_ids[] = { { .compatible = "mediatek,mt8183-dpi", .data = &mt8183_conf, },
- { .compatible = "mediatek,mt8186-dpi",
.data = &mt8186_conf,If Nicolas' patch [1] is correct, this should be
.data = &mt8192_conf,
Could you help to comfirm patch [1] is correct or not?
[1]
https://patchwork.kernel.org/project/linux-mediatek/patch/20220408013950.674...
Regards, CK
- }, { .compatible = "mediatek,mt8192-dpi", .data = &mt8192_conf, },
Hi CK:
Thanks for your review. I checked that mt8186_conf & mt8192_conf are the same. In the next version, I will remove mt8186_conf and reuse mt8192_conf.
Best Regards! xinlei
dri-devel@lists.freedesktop.org
-
CK Hu -
Rex-BC Chen -
xinlei.lee -
xinlei.lee＠mediatek.com