shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: vop2: fix the default plane_make configurations for RK3588

Browse Source 
The relationships between the main window and the splice window are:

Main     | Splice
Cluster0 | Cluster1
Cluster2 | Cluster3
Esmart0  | Esmart1
Esmart2  | Esmart3

The VP0 and VP1 should be used in combination when the display mode is
over 4k. The main window should attach to the VP0, while the splice
window should attach to the other.

Without this patch, the default plane_mask may not meet the above
requirement when the plane_mask is not assigned in DTS.

Change-Id: Ia676f519ce26d579b1066841715fe8678dc15852
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
This commit is contained in:
Damon Ding
2025-02-18 16:52:05 +08:00
committed by Tao Huang
parent c3dbb54a6d
commit a3d2c5d99a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
View File

@@ -5141,15 +5141,15 @@ static struct vop2_vp_plane_mask rk3588_vp_plane_mask[ROCKCHIP_MAX_CRTC][ROCKCHI
.attached_layers_nr = 4, .attached_layers_nr = 4,
.attached_layers = { .attached_layers = {
ROCKCHIP_VOP2_CLUSTER0, ROCKCHIP_VOP2_ESMART0, ROCKCHIP_VOP2_CLUSTER0, ROCKCHIP_VOP2_ESMART0,
ROCKCHIP_VOP2_CLUSTER1, ROCKCHIP_VOP2_ESMART1 ROCKCHIP_VOP2_CLUSTER2, ROCKCHIP_VOP2_ESMART2
}, },
}, },
{/* second display */ {/* second display */
.primary_plane_id = ROCKCHIP_VOP2_ESMART2, .primary_plane_id = ROCKCHIP_VOP2_ESMART1,
.attached_layers_nr = 4, .attached_layers_nr = 4,
.attached_layers = { .attached_layers = {
ROCKCHIP_VOP2_CLUSTER2, ROCKCHIP_VOP2_ESMART2, ROCKCHIP_VOP2_CLUSTER1, ROCKCHIP_VOP2_ESMART1,
ROCKCHIP_VOP2_CLUSTER3, ROCKCHIP_VOP2_ESMART3 ROCKCHIP_VOP2_CLUSTER3, ROCKCHIP_VOP2_ESMART3
}, },
}, },
@@ -5162,7 +5162,8 @@ static struct vop2_vp_plane_mask rk3588_vp_plane_mask[ROCKCHIP_MAX_CRTC][ROCKCHI
.primary_plane_id = ROCKCHIP_VOP2_ESMART0, .primary_plane_id = ROCKCHIP_VOP2_ESMART0,
.attached_layers_nr = 3, .attached_layers_nr = 3,
.attached_layers = { .attached_layers = {
ROCKCHIP_VOP2_CLUSTER0, ROCKCHIP_VOP2_CLUSTER1, ROCKCHIP_VOP2_ESMART0 ROCKCHIP_VOP2_CLUSTER0, ROCKCHIP_VOP2_CLUSTER2,
ROCKCHIP_VOP2_ESMART0
}, },
}, },
@@ -5170,7 +5171,8 @@ static struct vop2_vp_plane_mask rk3588_vp_plane_mask[ROCKCHIP_MAX_CRTC][ROCKCHI
.primary_plane_id = ROCKCHIP_VOP2_ESMART1, .primary_plane_id = ROCKCHIP_VOP2_ESMART1,
.attached_layers_nr = 3, .attached_layers_nr = 3,
.attached_layers = { .attached_layers = {
ROCKCHIP_VOP2_CLUSTER2, ROCKCHIP_VOP2_CLUSTER3, ROCKCHIP_VOP2_ESMART1 ROCKCHIP_VOP2_CLUSTER1, ROCKCHIP_VOP2_CLUSTER3,
ROCKCHIP_VOP2_ESMART1
}, },
}, },