[PATCH v13,2/3] drm: mediatek: Set dpi format in mmsys

[Allen-KH Cheng (程冠勳)]

An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20221124/7df438ef/attachment-0001.htm>
-------------- next part --------------
Hi Matthias,

Thank you for responding.

Is there anything we can do about this?

Best Regards,
Allen


On Mon, 2022-11-21 at 19:26 +0100, Matthias Brugger wrote:
> 
> On 24/10/2022 04:04, xinlei.lee at mediatek.com wrote:
> > From: Xinlei Lee <xinlei.lee at mediatek.com>
> > 
> > Dpi output needs to adjust the output format to dual edge for
> > MT8186.
> > 
> > Co-developed-by: Jitao Shi <jitao.shi at mediatek.com>
> > Signed-off-by: Jitao Shi <jitao.shi at mediatek.com>
> > Signed-off-by: Xinlei Lee <xinlei.lee at mediatek.com>
> > Reviewed-by: CK Hu <ck.hu at mediatek.com>
> > Reviewed-by: AngeloGioacchino Del Regno <
> > angelogioacchino.delregno at collabora.com>
> > Reviewed-by: Nícolas F. R. A. Prado <nfraprado at collabora.com>
> 
> I realized that I took this patch by error. I'll drop it from my tree
> now.
> 
> Regards,
> Matthias
> 
> > ---
> >   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 630a4e301ef6..ad87ecddf58d 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
> > @@ -15,6 +15,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>
> > @@ -30,6 +31,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,
> > @@ -67,6 +69,7 @@ struct mtk_dpi {
> >   	struct drm_connector *connector;
> >   	void __iomem *regs;
> >   	struct device *dev;
> > +	struct device *mmsys_dev;
> >   	struct clk *engine_clk;
> >   	struct clk *pixel_clk;
> >   	struct clk *tvd_clk;
> > @@ -135,6 +138,7 @@ struct mtk_dpi_yc_limit {
> >    * @yuv422_en_bit: Enable bit of yuv422.
> >    * @csc_enable_bit: Enable bit of CSC.
> >    * @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.
> >    */
> >   struct mtk_dpi_conf {
> >   	unsigned int (*cal_factor)(int clock);
> > @@ -153,6 +157,7 @@ struct mtk_dpi_conf {
> >   	u32 yuv422_en_bit;
> >   	u32 csc_enable_bit;
> >   	u32 pixels_per_iter;
> > +	bool edge_cfg_in_mmsys;
> >   };
> >   
> >   static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32
> > val, u32 mask)
> > @@ -449,8 +454,12 @@ 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->edge_cfg_in_mmsys)
> > +			mtk_mmsys_ddp_dpi_fmt_config(dpi->mmsys_dev,
> > MTK_DPI_RGB888_DDR_CON);
> >   	} else {
> >   		mtk_dpi_mask(dpi, DPI_DDR_SETTING, DDR_EN | DDR_4PHASE,
> > 0);
> > +		if (dpi->conf->edge_cfg_in_mmsys)
> > +			mtk_mmsys_ddp_dpi_fmt_config(dpi->mmsys_dev,
> > MTK_DPI_RGB888_SDR_CON);
> >   	}
> >   }
> >   
> > @@ -778,8 +787,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) {TThank you for responding.