From 0bbf74ec074fc6258cd140da593275837c88faf6 Mon Sep 17 00:00:00 2001 From: Chaoyi Chen Date: Thu, 28 Mar 2024 11:33:38 +0800 Subject: [PATCH] drm/rockchip: vop2: Only attach color_key prop when vop2 win support it Only some specific win support the color key feature. So for those win that don't support it, don't expose the color key prop to the user. Signed-off-by: Chaoyi Chen Change-Id: I75f0ca8c40a3bfa8e45b8a06bdb9576643296386 --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index c26cbae75a80..593a34b2ad6a 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -12324,7 +12324,8 @@ static int vop2_plane_init(struct vop2 *vop2, struct vop2_win *win, unsigned lon drm_object_attach_property(&win->base.base, win->output_width_prop, 0); drm_object_attach_property(&win->base.base, win->output_height_prop, 0); drm_object_attach_property(&win->base.base, win->scale_prop, 0); - drm_object_attach_property(&win->base.base, win->color_key_prop, 0); + if (win->regs->color_key.mask) + drm_object_attach_property(&win->base.base, win->color_key_prop, 0); return 0; }