drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 ++++ 1 file changed, 4 insertions(+)
Each window of a vop2 is usable by a specific set of video ports, so while
binding the vop2, we look through the list of available windows trying to
find one designated as primary-plane and usable by that specific port.
The code later wants to use drm_crtc_init_with_planes with that found
primary plane, but nothing has checked so far if a primary plane was
actually found.
For whatever reason, the rk3576 vp2 does not have a usable primary window
(if vp0 is also in use) which brought the issue to light and ended in a
null-pointer dereference further down.
As we expect a primary-plane to exist for a video-port, add a check at
the end of the window-iteration and fail probing if none was found.
Fixes: 604be85547ce ("drm/rockchip: Add VOP2 driver")
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index 7ddf311b38c6..a8dc2e55812a 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -2425,6 +2425,10 @@ static int vop2_create_crtcs(struct vop2 *vop2)
break;
}
}
+
+ if (!vp->primary_plane)
+ return dev_err_probe(drm->dev, -ENOENT,
+ "no primary plane for vp %d\n", i);
}
/* Register all unused window as overlay plane */
--
2.47.2
On Tue, 10 Jun 2025 23:27:48 +0200, Heiko Stuebner wrote: > Each window of a vop2 is usable by a specific set of video ports, so while > binding the vop2, we look through the list of available windows trying to > find one designated as primary-plane and usable by that specific port. > > The code later wants to use drm_crtc_init_with_planes with that found > primary plane, but nothing has checked so far if a primary plane was > actually found. > > [...] Applied, thanks! [1/1] drm/rockchip: vop2: fail cleanly if missing a primary plane for a video-port commit: f9f68bf1d0efeadb6c427c9dbb30f307a7def19b Best regards, -- Heiko Stuebner <heiko@sntech.de>
Hi Heiko, At 2025-06-11 05:27:48, "Heiko Stuebner" <heiko@sntech.de> wrote: >Each window of a vop2 is usable by a specific set of video ports, so while >binding the vop2, we look through the list of available windows trying to >find one designated as primary-plane and usable by that specific port. > >The code later wants to use drm_crtc_init_with_planes with that found >primary plane, but nothing has checked so far if a primary plane was >actually found. > >For whatever reason, the rk3576 vp2 does not have a usable primary window >(if vp0 is also in use) which brought the issue to light and ended in a >null-pointer dereference further down. > >As we expect a primary-plane to exist for a video-port, add a check at >the end of the window-iteration and fail probing if none was found. > >Fixes: 604be85547ce ("drm/rockchip: Add VOP2 driver") >Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Andy Yan <andy.yan@rock-chips.com> Thanks >--- > drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 ++++ > 1 file changed, 4 insertions(+) > >diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c >index 7ddf311b38c6..a8dc2e55812a 100644 >--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c >+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c >@@ -2425,6 +2425,10 @@ static int vop2_create_crtcs(struct vop2 *vop2) > break; > } > } >+ >+ if (!vp->primary_plane) >+ return dev_err_probe(drm->dev, -ENOENT, >+ "no primary plane for vp %d\n", i); > } > > /* Register all unused window as overlay plane */ >-- >2.47.2 >
© 2016 - 2025 Red Hat, Inc.