53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
From 03ec22e7a583478f1f56245060d1c1f95829d8f4 Mon Sep 17 00:00:00 2001
|
|
From: Jeffy Chen <jeffy.chen@rock-chips.com>
|
|
Date: Fri, 1 Apr 2022 22:17:07 +0800
|
|
Subject: [PATCH 3/3] HACK: drm: rockchip: Prefer non-cluster overlay planes
|
|
|
|
Change-Id: I65d40b50c96921b644de4601188c0518c99c9d72
|
|
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
|
|
---
|
|
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 635417630d29..398a68f9007d 100644
|
|
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
|
|
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
|
|
@@ -9765,6 +9765,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;
|
|
@@ -9980,9 +9981,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;
|
|
/*
|
|
@@ -10011,6 +10016,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
|
|
|