From 12f0cb64318fbb4d072cf0785516c81a792c8a43 Mon Sep 17 00:00:00 2001 From: Damon Ding Date: Wed, 5 Feb 2025 14:58:11 +0800 Subject: [PATCH] drm/rockchip: vop2: not to create plane_mask property of CRTC for VOP3 RK3528/RK3562/RK3576 use the VOP3 architecture, which supports flexible switching of planes between different VPs. User can switch planes between different CRTCs based on the &drm_plane.possible_crtcs in userspace, so the 'PLANE_MASK' property is not required. Change-Id: Icbd75bc4602fcfd69a10f2be9f5a8375bd7f2abe Signed-off-by: Damon Ding --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index b94263360ece..ae471b7433d1 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -14526,7 +14526,12 @@ static int vop2_create_crtc(struct vop2 *vop2, uint8_t enabled_vp_mask) drm_object_attach_property(&crtc->base, drm_dev->mode_config.tv_bottom_margin_property, 100); } - if (plane_mask) + /* + * For vop3, user can switch planes between different CRTCs based + * on the &drm_plane.possible_crtcs in userspace, so the 'PLANE_MASK' + * property is not required. + */ + if (plane_mask && !is_vop3(vop2)) vop2_crtc_create_plane_mask_property(vop2, crtc, plane_mask); vop2_crtc_create_feature_property(vop2, crtc); vop2_crtc_create_vrr_property(vop2, crtc);