Re: [PATCH v2 05/12] drm/rockchip: vop2: Set YUV/RGB overlay mode

[Andy Yan]

Hi Sasha:

On 11/27/23 22:16, Sascha Hauer wrote:
> On Wed, Nov 22, 2023 at 08:54:38PM +0800, Andy Yan wrote:
> > From: Andy Yan <andy.yan@xxxxxxxxxxxxxx>
> >
> > Set overlay mode register according to the
> > output mode is yuv or rgb.
> >
> > Signed-off-by: Andy Yan <andy.yan@xxxxxxxxxxxxxx>
> > ---
> >
> > (no changes since v1)
> >
> >   drivers/gpu/drm/rockchip/rockchip_drm_drv.h  |  1 +
> >   drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 19 ++++++++++++++++---
> >   2 files changed, 17 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
> > index 3d8ab2defa1b..7a58c5c9d4ec 100644
> > --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
> > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
> > @@ -51,6 +51,7 @@ struct rockchip_crtc_state {
> >   	u32 bus_format;
> >   	u32 bus_flags;
> >   	int color_space;
> > +	bool yuv_overlay;
> This struct already contains a bool type variable. Please add this one
> next to it to keep the struct size smaller.


Okay, will do.

> >   };
> >   #define to_rockchip_crtc_state(s) \
> >   		container_of(s, struct rockchip_crtc_state, base)
> > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> > index a019cc9bbd54..b32a291c5caa 100644
> > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> > @@ -1612,6 +1612,8 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc,
> >   
> >   	vop2->enable_count++;
> >   
> > +	vcstate->yuv_overlay = is_yuv_output(vcstate->bus_format);
> > +
> >   	vop2_crtc_enable_irq(vp, VP_INT_POST_BUF_EMPTY);
> >   
> >   	polflags = 0;
> > @@ -1639,7 +1641,7 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc,
> >   	if (vop2_output_uv_swap(vcstate->bus_format, vcstate->output_mode))
> >   		dsp_ctrl |= RK3568_VP_DSP_CTRL__DSP_RB_SWAP;
> >   
> > -	if (is_yuv_output(vcstate->bus_format))
> > +	if (vcstate->yuv_overlay)
> >   		dsp_ctrl |= RK3568_VP_DSP_CTRL__POST_DSP_OUT_R2Y;
> >   
> >   	vop2_dither_setup(crtc, &dsp_ctrl);
> > @@ -1948,10 +1950,12 @@ static void vop2_setup_layer_mixer(struct vop2_video_port *vp)
> >   	u16 hdisplay;
> >   	u32 bg_dly;
> >   	u32 pre_scan_dly;
> > +	u32 ovl_ctrl;
> >   	int i;
> >   	struct vop2_video_port *vp0 = &vop2->vps[0];
> >   	struct vop2_video_port *vp1 = &vop2->vps[1];
> >   	struct vop2_video_port *vp2 = &vop2->vps[2];
> > +	struct rockchip_crtc_state *vcstate = to_rockchip_crtc_state(vp->crtc.state);
> >   
> >   	adjusted_mode = &vp->crtc.state->adjusted_mode;
> >   	hsync_len = adjusted_mode->crtc_hsync_end - adjusted_mode->crtc_hsync_start;
> > @@ -1964,7 +1968,14 @@ static void vop2_setup_layer_mixer(struct vop2_video_port *vp)
> >   	pre_scan_dly = ((bg_dly + (hdisplay >> 1) - 1) << 16) | hsync_len;
> >   	vop2_vp_write(vp, RK3568_VP_PRE_SCAN_HTIMING, pre_scan_dly);
> >   
> > -	vop2_writel(vop2, RK3568_OVL_CTRL, 0);
> > +	ovl_ctrl = vop2_readl(vop2, RK3568_OVL_CTRL);
> > +	if (vcstate->yuv_overlay)
> > +		ovl_ctrl |= BIT(vp->id);
> > +	else
> > +		ovl_ctrl &= ~BIT(vp->id);
> Some
>
> #define RK3568_OVL_CTRL__YUV_MODE(vp)	BIT(vp)
>
> Would be nice.


Okay, will do.

> > +
> > +	vop2_writel(vop2, RK3568_OVL_CTRL, ovl_ctrl);
> Is it necessary to write this register twice?

I don't think so. Just follow the original code write it here.

Anyway, I will just write once in next version.


And would you please check my response about debugfs patch[0] when it is convenient for you?

I want to know what you think, and prepare the next version.


[0]https://patchwork.kernel.org/project/dri-devel/patch/20231122125601.3455031-1-andyshrk@xxxxxxx/

> > +
> >   	port_sel = vop2_readl(vop2, RK3568_OVL_PORT_SEL);
> >   	port_sel &= RK3568_OVL_PORT_SEL__SEL_PORT;
> >   
> > @@ -2036,9 +2047,11 @@ static void vop2_setup_layer_mixer(struct vop2_video_port *vp)
> >   		layer_sel |= RK3568_OVL_LAYER_SEL__LAYER(nlayer + ofs, 5);
> >   	}
> >   
> > +	ovl_ctrl |= RK3568_OVL_CTRL__LAYERSEL_REGDONE_IMD;
> > +
> >   	vop2_writel(vop2, RK3568_OVL_LAYER_SEL, layer_sel);
> >   	vop2_writel(vop2, RK3568_OVL_PORT_SEL, port_sel);
> > -	vop2_writel(vop2, RK3568_OVL_CTRL, RK3568_OVL_CTRL__LAYERSEL_REGDONE_IMD);
> > +	vop2_writel(vop2, RK3568_OVL_CTRL, ovl_ctrl);
> Sascha