From: Andy Yan <[email protected]>
The port mux bits of VP2 should be defined by RK3568_OVL_PORT_SET__PORT2_MUX,
this maybe a copy and paste error when this driver first introduced.
Hi Heiko:
Maybe thi is the problem you met when you porting the dsi2 driver.
I previously sent you this patch when you ask me about this issue on
email,but I'm not sure if you received it.
Andy Yan (1):
drm/rockchip: vop2: Fix the port mux of VP2
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
2.34.1
From: Andy Yan <[email protected]>
The port mux of VP2 should be RK3568_OVL_PORT_SET__PORT2_MUX.
Fixes: 604be85547ce ("drm/rockchip: Add VOP2 driver")
Signed-off-by: Andy Yan <[email protected]>
---
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index 97b0ab4b6db8..1f4250de570f 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -2377,7 +2377,7 @@ static void vop2_setup_layer_mixer(struct vop2_video_port *vp)
port_sel |= FIELD_PREP(RK3568_OVL_PORT_SET__PORT2_MUX,
(vp2->nlayers + vp1->nlayers + vp0->nlayers - 1));
else
- port_sel |= FIELD_PREP(RK3568_OVL_PORT_SET__PORT1_MUX, 8);
+ port_sel |= FIELD_PREP(RK3568_OVL_PORT_SET__PORT2_MUX, 8);
layer_sel = vop2_readl(vop2, RK3568_OVL_LAYER_SEL);
--
2.34.1
On Mon, Apr 22, 2024 at 06:19:05PM +0800, Andy Yan wrote:
> From: Andy Yan <[email protected]>
>
> The port mux of VP2 should be RK3568_OVL_PORT_SET__PORT2_MUX.
>
> Fixes: 604be85547ce ("drm/rockchip: Add VOP2 driver")
> Signed-off-by: Andy Yan <[email protected]>
Acked-by: Sascha Hauer <[email protected]>
Sascha
>
> ---
>
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> index 97b0ab4b6db8..1f4250de570f 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> @@ -2377,7 +2377,7 @@ static void vop2_setup_layer_mixer(struct vop2_video_port *vp)
> port_sel |= FIELD_PREP(RK3568_OVL_PORT_SET__PORT2_MUX,
> (vp2->nlayers + vp1->nlayers + vp0->nlayers - 1));
> else
> - port_sel |= FIELD_PREP(RK3568_OVL_PORT_SET__PORT1_MUX, 8);
> + port_sel |= FIELD_PREP(RK3568_OVL_PORT_SET__PORT2_MUX, 8);
>
> layer_sel = vop2_readl(vop2, RK3568_OVL_LAYER_SEL);
>
> --
> 2.34.1
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Am Montag, 22. April 2024, 12:19:05 CEST schrieb Andy Yan:
> From: Andy Yan <[email protected]>
>
> The port mux of VP2 should be RK3568_OVL_PORT_SET__PORT2_MUX.
>
> Fixes: 604be85547ce ("drm/rockchip: Add VOP2 driver")
> Signed-off-by: Andy Yan <[email protected]>
on a rk3588 with VP3 connected to a DSI display
Tested-by: Heiko Stuebner <[email protected]>
On Mon, 22 Apr 2024 18:19:04 +0800, Andy Yan wrote:
> From: Andy Yan <[email protected]>
>
>
> The port mux bits of VP2 should be defined by RK3568_OVL_PORT_SET__PORT2_MUX,
> this maybe a copy and paste error when this driver first introduced.
> Hi Heiko:
> Maybe thi is the problem you met when you porting the dsi2 driver.
> I previously sent you this patch when you ask me about this issue on
> email,but I'm not sure if you received it.
>
> [...]
Applied, thanks!
[1/1] drm/rockchip: vop2: Fix the port mux of VP2
commit: 2bdb481bf7a93c22b9fea8daefa2834aab23a70f
Best regards,
--
Heiko Stuebner <[email protected]>
On Thursday, 25 April 2024 17:19:58 CEST Heiko Stuebner wrote:
> On Mon, 22 Apr 2024 18:19:04 +0800, Andy Yan wrote:
> > From: Andy Yan <[email protected]>
> >
> > The port mux bits of VP2 should be defined by
> > RK3568_OVL_PORT_SET__PORT2_MUX, this maybe a copy and paste error when
> > this driver first introduced.>
> > Hi Heiko:
> > Maybe thi is the problem you met when you porting the dsi2 driver.
> >
>
> Applied, thanks!
>
> [1/1] drm/rockchip: vop2: Fix the port mux of VP2
> commit: 2bdb481bf7a93c22b9fea8daefa2834aab23a70f
Wasn't this patch supposed to be part of 6.10-rc1?
Am Mittwoch, 29. Mai 2024, 17:55:25 CEST schrieb Diederik de Haas:
> On Thursday, 25 April 2024 17:19:58 CEST Heiko Stuebner wrote:
> > On Mon, 22 Apr 2024 18:19:04 +0800, Andy Yan wrote:
> > > From: Andy Yan <[email protected]>
> > >
> > > The port mux bits of VP2 should be defined by
> > > RK3568_OVL_PORT_SET__PORT2_MUX, this maybe a copy and paste error when
> > > this driver first introduced.>
> > > Hi Heiko:
> > > Maybe thi is the problem you met when you porting the dsi2 driver.
> > >
> >
> > Applied, thanks!
> >
> > [1/1] drm/rockchip: vop2: Fix the port mux of VP2
> > commit: 2bdb481bf7a93c22b9fea8daefa2834aab23a70f
>
> Wasn't this patch supposed to be part of 6.10-rc1?
Looking at the drm-misc tree, the last tag for the drm-misc to drm-main
merge is labeled drm-misc-next-2024-04-25, same day as I applied the
patch.
In theory I think -rc6 is the cutoff for drm-misc changes for mainline,
which would've been the 28th of april, but there might've been simple
hickups preventing that last merge, resulting in the patch missing an
early cutoff.
On the other hand, somehow Torvald's tree actually has this commit [0],
just with a "Notice: this object is not reachable from any branch."
Possibly some drm-merge-mayhem?
All very confusing.
@Thomas, @Marten: do you possible have an idea what might've happened?
Heiko
[0] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2bdb481bf7a93c22b9fea8daefa2834aab23a70f