| Message ID | 20250211113409.1517534-7-angelogioacchino.delregno@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add support for MT8195/88 DPI, HDMIv2 and DDCv2 | expand |
On Tue, 2025-02-11 at 12:33 +0100, AngeloGioacchino Del Regno wrote: > External email : Please do not click links or open attachments until you have verified the sender or the content. > > > In preparation for adding support for MT8195's HDMI reserved DPI > instance, move the input_2p_en bit for DP_INTF to platform data. > > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > drivers/gpu/drm/mediatek/mtk_dpi.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c > index bb1a17f1384b..ad07005ad56e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c > @@ -143,6 +143,7 @@ struct mtk_dpi_factor { > * @channel_swap_shift: Shift value of channel swap. > * @yuv422_en_bit: Enable bit of yuv422. > * @csc_enable_bit: Enable bit of CSC. > + * @input_2p_en_bit: Enable bit of two pixel per round feature > * @pixels_per_iter: Quantity of transferred pixels per iteration. > * @edge_cfg_in_mmsys: If the edge configuration for DPI's output needs to be set in MMSYS. > */ > @@ -163,6 +164,7 @@ struct mtk_dpi_conf { > u32 channel_swap_shift; > u32 yuv422_en_bit; > u32 csc_enable_bit; > + u32 input_2p_en_bit; > u32 pixels_per_iter; > bool edge_cfg_in_mmsys; > }; > @@ -651,9 +653,9 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi, > mtk_dpi_dual_edge(dpi); > mtk_dpi_config_disable_edge(dpi); > } > - if (dpi->conf->input_2pixel) { > - mtk_dpi_mask(dpi, DPI_CON, DPINTF_INPUT_2P_EN, > - DPINTF_INPUT_2P_EN); > + if (dpi->conf->input_2p_en_bit && dpi->conf->input_2pixel) { When input_2p_en_bit > 0, it imply that input_2pixel is true. So input_2pixel is redundant. Drop input_2pixel in this patch. After this, Reviewed-by: CK Hu <ck.hu@mediatek.com> > + mtk_dpi_mask(dpi, DPI_CON, dpi->conf->input_2p_en_bit, > + dpi->conf->input_2p_en_bit); > } > mtk_dpi_sw_reset(dpi, false); > > @@ -1127,6 +1129,7 @@ static const struct mtk_dpi_conf mt8195_dpintf_conf = { > .channel_swap_shift = DPINTF_CH_SWAP, > .yuv422_en_bit = DPINTF_YUV422_EN, > .csc_enable_bit = DPINTF_CSC_ENABLE, > + .input_2p_en_bit = DPINTF_INPUT_2P_EN, > }; > > static int mtk_dpi_probe(struct platform_device *pdev) > -- > 2.48.1 >
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index bb1a17f1384b..ad07005ad56e 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -143,6 +143,7 @@ struct mtk_dpi_factor { * @channel_swap_shift: Shift value of channel swap. * @yuv422_en_bit: Enable bit of yuv422. * @csc_enable_bit: Enable bit of CSC. + * @input_2p_en_bit: Enable bit of two pixel per round feature * @pixels_per_iter: Quantity of transferred pixels per iteration. * @edge_cfg_in_mmsys: If the edge configuration for DPI's output needs to be set in MMSYS. */ @@ -163,6 +164,7 @@ struct mtk_dpi_conf { u32 channel_swap_shift; u32 yuv422_en_bit; u32 csc_enable_bit; + u32 input_2p_en_bit; u32 pixels_per_iter; bool edge_cfg_in_mmsys; }; @@ -651,9 +653,9 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi, mtk_dpi_dual_edge(dpi); mtk_dpi_config_disable_edge(dpi); } - if (dpi->conf->input_2pixel) { - mtk_dpi_mask(dpi, DPI_CON, DPINTF_INPUT_2P_EN, - DPINTF_INPUT_2P_EN); + if (dpi->conf->input_2p_en_bit && dpi->conf->input_2pixel) { + mtk_dpi_mask(dpi, DPI_CON, dpi->conf->input_2p_en_bit, + dpi->conf->input_2p_en_bit); } mtk_dpi_sw_reset(dpi, false); @@ -1127,6 +1129,7 @@ static const struct mtk_dpi_conf mt8195_dpintf_conf = { .channel_swap_shift = DPINTF_CH_SWAP, .yuv422_en_bit = DPINTF_YUV422_EN, .csc_enable_bit = DPINTF_CSC_ENABLE, + .input_2p_en_bit = DPINTF_INPUT_2P_EN, }; static int mtk_dpi_probe(struct platform_device *pdev)
In preparation for adding support for MT8195's HDMI reserved DPI instance, move the input_2p_en bit for DP_INTF to platform data. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- drivers/gpu/drm/mediatek/mtk_dpi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)