From c756473169d054f315b6ecd81d2dabcdd074aee4 Mon Sep 17 00:00:00 2001 From: Jeffy Chen Date: Fri, 1 Apr 2022 22:17:07 +0800 Subject: [PATCH 4/4] HACK: drm: rockchip: Prefer non-cluster overlay planes Change-Id: I65d40b50c96921b644de4601188c0518c99c9d72 Signed-off-by: Jeffy Chen --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 9f94836ac6c1..a40b42cdd2b0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -8730,6 +8730,7 @@ static int vop2_create_crtc(struct vop2 *vop2) bool find_primary_plane = false; bool bootloader_initialized = false; struct rockchip_drm_private *private = drm_dev->dev_private; + bool use_cluster = false; /* all planes can attach to any crtc */ possible_crtcs = (1 << vop2_data->nr_vps) - 1; @@ -8932,9 +8933,13 @@ static int vop2_create_crtc(struct vop2 *vop2) * create overlay planes of the leftover overlay win * Create drm_planes for overlay windows with possible_crtcs restricted */ +add_overlay: for (j = 0; j < vop2->registered_num_wins; j++) { win = &vop2->win[j]; + if (use_cluster != vop2_cluster_window(win)) + continue; + if (win->type != DRM_PLANE_TYPE_OVERLAY) continue; /* @@ -8961,6 +8966,11 @@ static int vop2_create_crtc(struct vop2 *vop2) DRM_WARN("failed to init overlay plane %s\n", win->name); } + if (!use_cluster) { + use_cluster = true; + goto add_overlay; + } + return registered_num_crtcs; } -- 2.20.1