From 3bc302ffb6e0e9304b01a6a2c91d101106848d62 Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Sat, 23 Aug 2025 09:38:18 +0800 Subject: [PATCH] drm/rockchip: vop2: fix null point when win->regs->scl is undefined some plane can't support scale up/down the win->regs->scl is undefined. Signed-off-by: Sandy Huang Change-Id: Ia103dcd0f2a805cba1ec0acfffe049e617fc5520 --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index b3d7feb93a29..c3faac7bdccf 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -90,7 +90,10 @@ REG_SET(x, name, win->offset, VOP_WIN_NAME(win, name), v, true) #define VOP_SCL_SET(x, win, name, v) \ - REG_SET(x, name, win->offset, win->regs->scl->name, v, true) + do { \ + if (win->regs->scl) \ + REG_SET(x, name, win->offset, win->regs->scl->name, v, true); \ + } while (0) #define VOP_CTRL_SET(x, name, v) \ REG_SET(x, name, 0, (x)->data->ctrl->name, v, false)