| Message ID | 1659693461-27057-3-git-send-email-xinlei.lee@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add dpi output format control for MT8186 | expand |
Hi Xinlei, On Fri, Aug 05, 2022 at 05:57:41PM +0800, xinlei.lee@mediatek.com wrote: > From: Xinlei Lee <xinlei.lee@mediatek.com> > > Dpi output needs to adjust the output format to dual edge for MT8186. Could you explain a bit more why this is needed? What does this configuration do? And why is MMSYS involved in a DPI configuration? Also, is this a configuration specific to MT8186? I enabled the flag on MT8192 just to test and didn't see any difference in behavior. > > Signed-off-by: Jitao Shi <jitao.shi@mediatek.com> If Jitao also helped in the writing of this code, then there should also be a co-developed-by tag for Jitao before the Signed-off-by [1]. [1] https://www.kernel.org/doc/html/latest/process/submitting-patches.html#when-to-use-acked-by-cc-and-co-developed-by > Signed-off-by: Xinlei Lee <xinlei.lee@mediatek.com> [..] > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c [..] > @@ -151,6 +154,7 @@ struct mtk_dpi_conf { > u32 yuv422_en_bit; > u32 csc_enable_bit; > u32 pixels_per_iter; > + bool rgb888_dual_enable; You're missing a description of this property in the struct's comment above: drivers/gpu/drm/mediatek/mtk_dpi.c:160: warning: Function parameter or member 'rgb888_dual_enable' not described in 'mtk_dpi_conf' Thanks, Nícolas
On Fri, 2022-08-19 at 14:43 -0400, Nícolas F. R. A. Prado wrote: > Hi Xinlei, > > On Fri, Aug 05, 2022 at 05:57:41PM +0800, xinlei.lee@mediatek.com > wrote: > > From: Xinlei Lee <xinlei.lee@mediatek.com> > > > > Dpi output needs to adjust the output format to dual edge for > > MT8186. > > Could you explain a bit more why this is needed? What does this > configuration > do? And why is MMSYS involved in a DPI configuration? > > Also, is this a configuration specific to MT8186? I enabled the flag > on MT8192 > just to test and didn't see any difference in behavior. > > > > > Signed-off-by: Jitao Shi <jitao.shi@mediatek.com> > > If Jitao also helped in the writing of this code, then there should > also be a > co-developed-by tag for Jitao before the Signed-off-by [1]. > > [1] > https://urldefense.com/v3/__https://www.kernel.org/doc/html/latest/process/submitting-patches.html*when-to-use-acked-by-cc-and-co-developed-by__;Iw!!CTRNKA9wMg0ARbw!wlM0Ma8TeMR5EM0eUg1Z1JIDK_SF5rATf2UtVFJATWlzCSYABFbhD8yIo-_YxePWwQ$ > > > > Signed-off-by: Xinlei Lee <xinlei.lee@mediatek.com> > > [..] > > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c > > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c > > [..] > > @@ -151,6 +154,7 @@ struct mtk_dpi_conf { > > u32 yuv422_en_bit; > > u32 csc_enable_bit; > > u32 pixels_per_iter; > > + bool rgb888_dual_enable; > > You're missing a description of this property in the struct's comment > above: > > drivers/gpu/drm/mediatek/mtk_dpi.c:160: warning: Function parameter > or member 'rgb888_dual_enable' not described in 'mtk_dpi_conf' > > Thanks, > Nícolas Hi Nícolas: Thanks for your careful review. First of all, MT8186 needs to set this bit of MMSYS because HW has been modified at that time, SW needs to cooperate. And the register (MMSYS) reserved for dpi will be used for output format control (dual_edge/single_edge). Since it is a modification for MT8186, setting it on MT8192 will not have any effect. If there are no other comments, I will revise it in the next edition: 1. Modify the label of jitao to Co-developed-by; 2. Add missing a description of this property in the mtk_dpi_conf. Best Regards! Xinlei
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index fb0b79704636..7eb6315f5b80 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -14,6 +14,7 @@ #include <linux/of_graph.h> #include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> +#include <linux/soc/mediatek/mtk-mmsys.h> #include <linux/types.h> #include <video/videomode.h> @@ -28,6 +29,7 @@ #include "mtk_disp_drv.h" #include "mtk_dpi_regs.h" #include "mtk_drm_ddp_comp.h" +#include "mtk_drm_drv.h" enum mtk_dpi_out_bit_num { MTK_DPI_OUT_BIT_NUM_8BITS, @@ -80,6 +82,7 @@ struct mtk_dpi { struct pinctrl_state *pins_dpi; u32 output_fmt; int refcount; + struct device *mmsys_dev; }; static inline struct mtk_dpi *bridge_to_dpi(struct drm_bridge *b) @@ -151,6 +154,7 @@ struct mtk_dpi_conf { u32 yuv422_en_bit; u32 csc_enable_bit; u32 pixels_per_iter; + bool rgb888_dual_enable; }; static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32 val, u32 mask) @@ -447,6 +451,9 @@ static void mtk_dpi_dual_edge(struct mtk_dpi *dpi) mtk_dpi_mask(dpi, DPI_OUTPUT_SETTING, dpi->output_fmt == MEDIA_BUS_FMT_RGB888_2X12_LE ? EDGE_SEL : 0, EDGE_SEL); + if (dpi->conf->rgb888_dual_enable) + mtk_mmsys_ddp_dpi_confing(dpi->mmsys_dev, DPI_RGB888_DDR_CON, + DPI_FORMAT_MASK, NULL); } else { mtk_dpi_mask(dpi, DPI_DDR_SETTING, DDR_EN | DDR_4PHASE, 0); } @@ -776,8 +783,10 @@ static int mtk_dpi_bind(struct device *dev, struct device *master, void *data) { struct mtk_dpi *dpi = dev_get_drvdata(dev); struct drm_device *drm_dev = data; + struct mtk_drm_private *priv = drm_dev->dev_private; int ret; + dpi->mmsys_dev = priv->mmsys_dev; ret = drm_simple_encoder_init(drm_dev, &dpi->encoder, DRM_MODE_ENCODER_TMDS); if (ret) { @@ -928,6 +937,24 @@ static const struct mtk_dpi_conf mt8183_conf = { .csc_enable_bit = CSC_ENABLE, }; +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), + .rgb888_dual_enable = true, + .pixels_per_iter = 1, + .is_ck_de_pol = true, + .swap_input_support = true, + .support_direct_pin = true, + .dimension_mask = HPW_MASK, + .hvsize_mask = HSIZE_MASK, + .channel_swap_shift = CH_SWAP, + .yuv422_en_bit = YUV422_EN, + .csc_enable_bit = CSC_ENABLE, +}; + static const struct mtk_dpi_conf mt8192_conf = { .cal_factor = mt8183_calculate_factor, .reg_h_fre_con = 0xe0, @@ -1078,6 +1105,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, }, diff --git a/drivers/gpu/drm/mediatek/mtk_dpi_regs.h b/drivers/gpu/drm/mediatek/mtk_dpi_regs.h index 62bd4931b344..e5d254a2097b 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi_regs.h +++ b/drivers/gpu/drm/mediatek/mtk_dpi_regs.h @@ -235,4 +235,8 @@ #define MATRIX_SEL_RGB_TO_JPEG 0 #define MATRIX_SEL_RGB_TO_BT601 2 +#define DPI_FORMAT_MASK 0x1 +#define DPI_RGB888_DDR_CON BIT(0) +#define DPI_RGB565_SDR_CON BIT(1) + #endif /* __MTK_DPI_REGS_H */ diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 0f07a151665c..802ea10232c9 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -808,6 +808,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { .data = (void *)MTK_DPI }, { .compatible = "mediatek,mt8183-dpi", .data = (void *)MTK_DPI }, + { .compatible = "mediatek,mt8186-dpi", + .data = (void *)MTK_DPI }, { .compatible = "mediatek,mt8192-dpi", .data = (void *)MTK_DPI }, { .compatible = "mediatek,mt8195-dp-intf",