* [PATCH 0/3] mt8183 dpi supports dual edge
@ 2021-03-30 15:53 Jitao Shi
2021-03-30 15:53 ` [PATCH 1/3] drm/mediatek: dpi dual edge sample mode support Jitao Shi
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Jitao Shi @ 2021-03-30 15:53 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Matthias Brugger, Daniel Vetter,
David Airlie, dri-devel, linux-kernel
Cc: devicetree, Jitao Shi, srv_heupstream, huijuan.xie, stonea168,
cawa.cheng, rex-bc.chen, linux-mediatek, yingjoe.chen,
eddie.huang, linux-arm-kernel
DPI can sample on falling, rising or both edge.
When DPI sample the data both rising and falling edge.
It can reduce half data io pins.
Jitao Shi (3):
drm/mediatek: dpi dual edge sample mode support
drm/mediatek: config mt8183 driver data to support dual edge sample
drm/mediatek: dpi: add bus format negociation
drivers/gpu/drm/mediatek/mtk_dpi.c | 109 +++++++++++++++++++++++++++++++++++--
1 file changed, 104 insertions(+), 5 deletions(-)
--
2.12.5
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/3] drm/mediatek: dpi dual edge sample mode support 2021-03-30 15:53 [PATCH 0/3] mt8183 dpi supports dual edge Jitao Shi @ 2021-03-30 15:53 ` Jitao Shi 2021-03-30 15:53 ` [PATCH 2/3] drm/mediatek: config mt8183 driver data to support dual edge sample Jitao Shi 2021-03-30 15:53 ` [PATCH 3/3] drm/mediatek: dpi: add bus format negociation Jitao Shi 2 siblings, 0 replies; 5+ messages in thread From: Jitao Shi @ 2021-03-30 15:53 UTC (permalink / raw) To: Rob Herring, Mark Rutland, Matthias Brugger, Daniel Vetter, David Airlie, dri-devel, linux-kernel Cc: devicetree, Jitao Shi, srv_heupstream, huijuan.xie, stonea168, cawa.cheng, rex-bc.chen, linux-mediatek, yingjoe.chen, eddie.huang, linux-arm-kernel DPI can sample on falling, rising or both edge. When DPI sample the data both rising and falling edge. It can reduce half data io pins. Signed-off-by: Jitao Shi <jitao.shi@mediatek.com> --- drivers/gpu/drm/mediatek/mtk_dpi.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index 52f11a63a330..ccd681a2a4c2 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -81,6 +81,7 @@ struct mtk_dpi { struct pinctrl *pinctrl; struct pinctrl_state *pins_gpio; struct pinctrl_state *pins_dpi; + bool ddr_edge_sel; int refcount; }; @@ -119,6 +120,7 @@ struct mtk_dpi_conf { unsigned int (*cal_factor)(int clock); u32 reg_h_fre_con; bool edge_sel_en; + bool dual_edge; }; static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32 val, u32 mask) @@ -378,6 +380,15 @@ static void mtk_dpi_config_color_format(struct mtk_dpi *dpi, } } +static void mtk_dpi_dual_edge(struct mtk_dpi *dpi) +{ + if (dpi->conf->dual_edge) { + mtk_dpi_mask(dpi, DPI_DDR_SETTING, DDR_EN | DDR_4PHASE, + DDR_EN | DDR_4PHASE); + mtk_dpi_mask(dpi, DPI_OUTPUT_SETTING, dpi->ddr_edge_sel ? EDGE_SEL : 0, EDGE_SEL); + } +} + static void mtk_dpi_power_off(struct mtk_dpi *dpi) { if (WARN_ON(dpi->refcount == 0)) @@ -516,6 +527,7 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi, mtk_dpi_config_yc_map(dpi, dpi->yc_map); mtk_dpi_config_color_format(dpi, dpi->color_format); mtk_dpi_config_2n_h_fre(dpi); + mtk_dpi_dual_edge(dpi); mtk_dpi_config_disable_edge(dpi); mtk_dpi_sw_reset(dpi, false); -- 2.12.5 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] drm/mediatek: config mt8183 driver data to support dual edge sample 2021-03-30 15:53 [PATCH 0/3] mt8183 dpi supports dual edge Jitao Shi 2021-03-30 15:53 ` [PATCH 1/3] drm/mediatek: dpi dual edge sample mode support Jitao Shi @ 2021-03-30 15:53 ` Jitao Shi 2021-03-30 15:53 ` [PATCH 3/3] drm/mediatek: dpi: add bus format negociation Jitao Shi 2 siblings, 0 replies; 5+ messages in thread From: Jitao Shi @ 2021-03-30 15:53 UTC (permalink / raw) To: Rob Herring, Mark Rutland, Matthias Brugger, Daniel Vetter, David Airlie, dri-devel, linux-kernel Cc: devicetree, Jitao Shi, srv_heupstream, huijuan.xie, stonea168, cawa.cheng, rex-bc.chen, linux-mediatek, yingjoe.chen, eddie.huang, linux-arm-kernel Signed-off-by: Jitao Shi <jitao.shi@mediatek.com> --- drivers/gpu/drm/mediatek/mtk_dpi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index ccd681a2a4c2..87bb27649c4c 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -696,6 +696,7 @@ static const struct mtk_dpi_conf mt2701_conf = { static const struct mtk_dpi_conf mt8183_conf = { .cal_factor = mt8183_calculate_factor, .reg_h_fre_con = 0xe0, + .dual_edge = true, }; static int mtk_dpi_probe(struct platform_device *pdev) -- 2.12.5 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] drm/mediatek: dpi: add bus format negociation 2021-03-30 15:53 [PATCH 0/3] mt8183 dpi supports dual edge Jitao Shi 2021-03-30 15:53 ` [PATCH 1/3] drm/mediatek: dpi dual edge sample mode support Jitao Shi 2021-03-30 15:53 ` [PATCH 2/3] drm/mediatek: config mt8183 driver data to support dual edge sample Jitao Shi @ 2021-03-30 15:53 ` Jitao Shi 2021-04-01 2:08 ` CK Hu 2 siblings, 1 reply; 5+ messages in thread From: Jitao Shi @ 2021-03-30 15:53 UTC (permalink / raw) To: Rob Herring, Mark Rutland, Matthias Brugger, Daniel Vetter, David Airlie, dri-devel, linux-kernel Cc: devicetree, Jitao Shi, srv_heupstream, huijuan.xie, stonea168, cawa.cheng, rex-bc.chen, linux-mediatek, yingjoe.chen, eddie.huang, linux-arm-kernel Add the atomic_get_output_bus_fmts, atomic_get_input_bus_fmts to negociate the possible output and input formats for the current mode and monitor, and use the negotiated formats in a basic atomic_check callback. Signed-off-by: Jitao Shi <jitao.shi@mediatek.com> --- drivers/gpu/drm/mediatek/mtk_dpi.c | 96 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index 87bb27649c4c..4e45d1b01b0c 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -81,6 +81,8 @@ struct mtk_dpi { struct pinctrl *pinctrl; struct pinctrl_state *pins_gpio; struct pinctrl_state *pins_dpi; + unsigned int in_bus_format; + unsigned int out_bus_format; bool ddr_edge_sel; int refcount; }; @@ -534,6 +536,92 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi, return 0; } +#define MAX_OUTPUT_SEL_FORMATS 2 + +static u32 *mtk_dpi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state, + unsigned int *num_output_fmts) +{ + struct drm_display_mode *mode = &crtc_state->mode; + u32 *output_fmts; + struct mtk_dpi *dpi = bridge_to_dpi(bridge); + + *num_output_fmts = 0; + + output_fmts = kcalloc(MAX_OUTPUT_SEL_FORMATS, sizeof(*output_fmts), + GFP_KERNEL); + if (!output_fmts) + return NULL; + + /* Default 8bit RGB fallback */ + if (dpi->conf->dual_edge) { + output_fmts[0] = MEDIA_BUS_FMT_RGB888_2X12_LE; + output_fmts[1] = MEDIA_BUS_FMT_RGB888_2X12_BE; + *num_output_fmts = 2; + } else { + output_fmts[0] = MEDIA_BUS_FMT_RGB888_1X24; + *num_output_fmts = 1; + } + + return output_fmts; +} + +#define MAX_INPUT_SEL_FORMATS 1 + +static u32 *mtk_dpi_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state, + u32 output_fmt, + unsigned int *num_input_fmts) +{ + u32 *input_fmts; + + *num_input_fmts = 0; + + input_fmts = kcalloc(MAX_INPUT_SEL_FORMATS, sizeof(*input_fmts), + GFP_KERNEL); + if (!input_fmts) + return NULL; + + *num_input_fmts = 1; + input_fmts[0] = MEDIA_BUS_FMT_RGB888_1X24; + + return input_fmts; +} + +static int mtk_dpi_bridge_atomic_check(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state) +{ + struct mtk_dpi *dpi = bridge->driver_private; + + dpi->out_bus_format = bridge_state->output_bus_cfg.format; + + dpi->in_bus_format = bridge_state->input_bus_cfg.format; + + dev_dbg(dpi->dev, "input format 0x%04x, output format 0x%04x\n", + bridge_state->input_bus_cfg.format, + bridge_state->output_bus_cfg.format); + + if (dpi->out_bus_format == MEDIA_BUS_FMT_RGB888_2X12_LE || + dpi->out_bus_format == MEDIA_BUS_FMT_RGB888_2X12_BE) { + dpi->ddr_edge_sel = + (dpi->out_bus_format == MEDIA_BUS_FMT_RGB888_2X12_LE) ? + true : false; + } + + dpi->bit_num = MTK_DPI_OUT_BIT_NUM_8BITS; + dpi->channel_swap = MTK_DPI_OUT_CHANNEL_SWAP_RGB; + dpi->yc_map = MTK_DPI_OUT_YC_MAP_RGB; + dpi->color_format = MTK_DPI_COLOR_FORMAT_RGB; + + return 0; +} + static int mtk_dpi_bridge_attach(struct drm_bridge *bridge, enum drm_bridge_attach_flags flags) { @@ -572,6 +660,9 @@ static const struct drm_bridge_funcs mtk_dpi_bridge_funcs = { .mode_set = mtk_dpi_bridge_mode_set, .disable = mtk_dpi_bridge_disable, .enable = mtk_dpi_bridge_enable, + .atomic_check = mtk_dpi_bridge_atomic_check, + .atomic_get_output_bus_fmts = mtk_dpi_bridge_atomic_get_output_bus_fmts, + .atomic_get_input_bus_fmts = mtk_dpi_bridge_atomic_get_input_bus_fmts, }; static void mtk_dpi_start(struct mtk_ddp_comp *comp) @@ -621,11 +712,6 @@ static int mtk_dpi_bind(struct device *dev, struct device *master, void *data) goto err_cleanup; } - dpi->bit_num = MTK_DPI_OUT_BIT_NUM_8BITS; - dpi->channel_swap = MTK_DPI_OUT_CHANNEL_SWAP_RGB; - dpi->yc_map = MTK_DPI_OUT_YC_MAP_RGB; - dpi->color_format = MTK_DPI_COLOR_FORMAT_RGB; - return 0; err_cleanup: -- 2.12.5 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] drm/mediatek: dpi: add bus format negociation 2021-03-30 15:53 ` [PATCH 3/3] drm/mediatek: dpi: add bus format negociation Jitao Shi @ 2021-04-01 2:08 ` CK Hu 0 siblings, 0 replies; 5+ messages in thread From: CK Hu @ 2021-04-01 2:08 UTC (permalink / raw) To: Jitao Shi Cc: Mark Rutland, devicetree, srv_heupstream, David Airlie, huijuan.xie, stonea168, linux-kernel, dri-devel, cawa.cheng, rex-bc.chen, Rob Herring, linux-mediatek, Matthias Brugger, yingjoe.chen, eddie.huang, linux-arm-kernel Hi, Jitao: On Tue, 2021-03-30 at 23:53 +0800, Jitao Shi wrote: > Add the atomic_get_output_bus_fmts, atomic_get_input_bus_fmts to negociate > the possible output and input formats for the current mode and monitor, > and use the negotiated formats in a basic atomic_check callback. > > Signed-off-by: Jitao Shi <jitao.shi@mediatek.com> > --- > drivers/gpu/drm/mediatek/mtk_dpi.c | 96 ++++++++++++++++++++++++++++++++++++-- > 1 file changed, 91 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c > index 87bb27649c4c..4e45d1b01b0c 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c > @@ -81,6 +81,8 @@ struct mtk_dpi { > struct pinctrl *pinctrl; > struct pinctrl_state *pins_gpio; > struct pinctrl_state *pins_dpi; > + unsigned int in_bus_format; > + unsigned int out_bus_format; Why do you keep these two value? You does not use them. > bool ddr_edge_sel; > int refcount; > }; > @@ -534,6 +536,92 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi, > return 0; > } > > +#define MAX_OUTPUT_SEL_FORMATS 2 > + > +static u32 *mtk_dpi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge, > + struct drm_bridge_state *bridge_state, > + struct drm_crtc_state *crtc_state, > + struct drm_connector_state *conn_state, > + unsigned int *num_output_fmts) > +{ > + struct drm_display_mode *mode = &crtc_state->mode; > + u32 *output_fmts; > + struct mtk_dpi *dpi = bridge_to_dpi(bridge); > + > + *num_output_fmts = 0; > + > + output_fmts = kcalloc(MAX_OUTPUT_SEL_FORMATS, sizeof(*output_fmts), > + GFP_KERNEL); > + if (!output_fmts) > + return NULL; > + > + /* Default 8bit RGB fallback */ > + if (dpi->conf->dual_edge) { > + output_fmts[0] = MEDIA_BUS_FMT_RGB888_2X12_LE; > + output_fmts[1] = MEDIA_BUS_FMT_RGB888_2X12_BE; So mt8183 does not support MEDIA_BUS_FMT_RGB888_1X24? > + *num_output_fmts = 2; > + } else { > + output_fmts[0] = MEDIA_BUS_FMT_RGB888_1X24; > + *num_output_fmts = 1; > + } > + > + return output_fmts; > +} > + > +#define MAX_INPUT_SEL_FORMATS 1 > + > +static u32 *mtk_dpi_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge, > + struct drm_bridge_state *bridge_state, > + struct drm_crtc_state *crtc_state, > + struct drm_connector_state *conn_state, > + u32 output_fmt, > + unsigned int *num_input_fmts) > +{ > + u32 *input_fmts; > + > + *num_input_fmts = 0; > + > + input_fmts = kcalloc(MAX_INPUT_SEL_FORMATS, sizeof(*input_fmts), > + GFP_KERNEL); > + if (!input_fmts) > + return NULL; > + > + *num_input_fmts = 1; > + input_fmts[0] = MEDIA_BUS_FMT_RGB888_1X24; > + > + return input_fmts; > +} > + > +static int mtk_dpi_bridge_atomic_check(struct drm_bridge *bridge, > + struct drm_bridge_state *bridge_state, > + struct drm_crtc_state *crtc_state, > + struct drm_connector_state *conn_state) > +{ > + struct mtk_dpi *dpi = bridge->driver_private; > + > + dpi->out_bus_format = bridge_state->output_bus_cfg.format; > + > + dpi->in_bus_format = bridge_state->input_bus_cfg.format; > + > + dev_dbg(dpi->dev, "input format 0x%04x, output format 0x%04x\n", > + bridge_state->input_bus_cfg.format, > + bridge_state->output_bus_cfg.format); > + > + if (dpi->out_bus_format == MEDIA_BUS_FMT_RGB888_2X12_LE || > + dpi->out_bus_format == MEDIA_BUS_FMT_RGB888_2X12_BE) { I think you could remove this 'if' checking. Regards, CK. > + dpi->ddr_edge_sel = > + (dpi->out_bus_format == MEDIA_BUS_FMT_RGB888_2X12_LE) ? > + true : false; > + } > + > + dpi->bit_num = MTK_DPI_OUT_BIT_NUM_8BITS; > + dpi->channel_swap = MTK_DPI_OUT_CHANNEL_SWAP_RGB; > + dpi->yc_map = MTK_DPI_OUT_YC_MAP_RGB; > + dpi->color_format = MTK_DPI_COLOR_FORMAT_RGB; > + > + return 0; > +} > + > static int mtk_dpi_bridge_attach(struct drm_bridge *bridge, > enum drm_bridge_attach_flags flags) > { > @@ -572,6 +660,9 @@ static const struct drm_bridge_funcs mtk_dpi_bridge_funcs = { > .mode_set = mtk_dpi_bridge_mode_set, > .disable = mtk_dpi_bridge_disable, > .enable = mtk_dpi_bridge_enable, > + .atomic_check = mtk_dpi_bridge_atomic_check, > + .atomic_get_output_bus_fmts = mtk_dpi_bridge_atomic_get_output_bus_fmts, > + .atomic_get_input_bus_fmts = mtk_dpi_bridge_atomic_get_input_bus_fmts, > }; > > static void mtk_dpi_start(struct mtk_ddp_comp *comp) > @@ -621,11 +712,6 @@ static int mtk_dpi_bind(struct device *dev, struct device *master, void *data) > goto err_cleanup; > } > > - dpi->bit_num = MTK_DPI_OUT_BIT_NUM_8BITS; > - dpi->channel_swap = MTK_DPI_OUT_CHANNEL_SWAP_RGB; > - dpi->yc_map = MTK_DPI_OUT_YC_MAP_RGB; > - dpi->color_format = MTK_DPI_COLOR_FORMAT_RGB; > - > return 0; > > err_cleanup: _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-04-01 2:13 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-03-30 15:53 [PATCH 0/3] mt8183 dpi supports dual edge Jitao Shi 2021-03-30 15:53 ` [PATCH 1/3] drm/mediatek: dpi dual edge sample mode support Jitao Shi 2021-03-30 15:53 ` [PATCH 2/3] drm/mediatek: config mt8183 driver data to support dual edge sample Jitao Shi 2021-03-30 15:53 ` [PATCH 3/3] drm/mediatek: dpi: add bus format negociation Jitao Shi 2021-04-01 2:08 ` CK Hu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox