From b5903b409dd622cc1884b890324ae29aa635bea2 Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Mon, 3 Jun 2024 15:12:21 +0800 Subject: [PATCH] drm/rockchip: vop2: no need to double attach cluster win share_id_prop Cluster win only need to attach share_id_prop as ordinary win, just like esmart parent win. Fixes: 48c83387b1b1 ("drm/rockchip: vop2: Add unique share id for Cluster window") Signed-off-by: Sandy Huang Change-Id: I45a7486c73ca75a04baba6eb1ac4bda3daab3caa --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 730e215cb909..cd27816902ba 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -12738,9 +12738,6 @@ static int vop2_plane_init(struct vop2 *vop2, struct vop2_win *win, unsigned lon drm_object_attach_property(&win->base.base, private->async_commit_prop, 0); - if (win->feature & (WIN_FEATURE_CLUSTER_SUB | WIN_FEATURE_CLUSTER_MAIN)) - drm_object_attach_property(&win->base.base, private->share_id_prop, win->plane_id); - if (win->parent) drm_object_attach_property(&win->base.base, private->share_id_prop, win->parent->base.base.id);