From e7a890df11cf0a8f5a379bd3eae5f5d490e8835a Mon Sep 17 00:00:00 2001 From: Amine Najahi Date: Tue, 5 Nov 2019 18:40:18 -0500 Subject: [PATCH] disp: msm: sde: add 4LM topology variants in resource manager Add 4LM topology variants in resource manager and in drm connector topology name property. Change-Id: I13e6eaafe60037b48d2c9d356f668b69720cbf48 Signed-off-by: Amine Najahi --- msm/sde/sde_connector.c | 4 ++++ msm/sde/sde_rm.c | 8 ++++++++ msm/sde/sde_rm.h | 8 ++++++++ 3 files changed, 20 insertions(+) diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c index 888c1d1dd5..ba5574f3b9 100644 --- a/msm/sde/sde_connector.c +++ b/msm/sde/sde_connector.c @@ -42,6 +42,10 @@ static const struct drm_prop_enum_list e_topology_name[] = { {SDE_RM_TOPOLOGY_DUALPIPE_3DMERGE_VDC, "sde_dualpipemerge_vdc"}, {SDE_RM_TOPOLOGY_DUALPIPE_DSCMERGE, "sde_dualpipe_dscmerge"}, {SDE_RM_TOPOLOGY_PPSPLIT, "sde_ppsplit"}, + {SDE_RM_TOPOLOGY_QUADPIPE_3DMERGE, "sde_quadpipemerge"}, + {SDE_RM_TOPOLOGY_QUADPIPE_3DMERGE_DSC, "sde_quadpipe_3dmerge_dsc"}, + {SDE_RM_TOPOLOGY_QUADPIPE_DSCMERGE, "sde_quadpipe_dscmerge"}, + {SDE_RM_TOPOLOGY_QUADPIPE_DSC4HSMERGE, "sde_quadpipe_dsc4hsmerge"}, }; static const struct drm_prop_enum_list e_topology_control[] = { {SDE_RM_TOPCTL_RESERVE_LOCK, "reserve_lock"}, diff --git a/msm/sde/sde_rm.c b/msm/sde/sde_rm.c index 843d388aa5..e681ac3453 100644 --- a/msm/sde/sde_rm.c +++ b/msm/sde/sde_rm.c @@ -86,6 +86,14 @@ static const struct sde_rm_topology_def g_top_table_v1[SDE_RM_TOPOLOGY_MAX] = { MSM_DISPLAY_COMPRESSION_DSC }, { SDE_RM_TOPOLOGY_PPSPLIT, 1, 0, 2, 1, true, MSM_DISPLAY_COMPRESSION_NONE }, + { SDE_RM_TOPOLOGY_QUADPIPE_3DMERGE, 4, 0, 2, 1, false, + MSM_DISPLAY_COMPRESSION_NONE }, + { SDE_RM_TOPOLOGY_QUADPIPE_3DMERGE_DSC, 4, 3, 2, 1, false, + MSM_DISPLAY_COMPRESSION_DSC }, + { SDE_RM_TOPOLOGY_QUADPIPE_DSCMERGE, 4, 4, 2, 1, false, + MSM_DISPLAY_COMPRESSION_DSC }, + { SDE_RM_TOPOLOGY_QUADPIPE_DSC4HSMERGE, 4, 4, 1, 1, false, + MSM_DISPLAY_COMPRESSION_DSC }, }; diff --git a/msm/sde/sde_rm.h b/msm/sde/sde_rm.h index c39d56a3ec..4e26f55a0b 100644 --- a/msm/sde/sde_rm.h +++ b/msm/sde/sde_rm.h @@ -27,6 +27,10 @@ * @SDE_RM_TOPOLOGY_DUALPIPE_3DMERGE_VDC: 2 LM, 2 PP, 3DMux, 1 VDC, 1 INTF/WB * @SDE_RM_TOPOLOGY_DUALPIPE_DSCMERGE: 2 LM, 2 PP, 2 DSC Merge, 1 INTF/WB * @SDE_RM_TOPOLOGY_PPSPLIT: 1 LM, 2 PPs, 2 INTF/WB + * @SDE_RM_TOPOLOGY_QUADPIPE_3DMERGE 4 LM, 4 PP, 3DMux, 2 INTF + * @SDE_RM_TOPOLOGY_QUADPIPE_3DMERGE_DSC 4 LM, 4 PP, 3DMux, 3 DSC, 2 INTF + * @SDE_RM_TOPOLOGY_QUADPIPE_DSCMERE 4 LM, 4 PP, 4 DSC Merge, 2 INTF + * @SDE_RM_TOPOLOGY_QUADPIPE_DSC4HSMERGE 4 LM, 4 PP, 4 DSC Merge, 1 INTF */ enum sde_rm_topology_name { SDE_RM_TOPOLOGY_NONE = 0, @@ -40,6 +44,10 @@ enum sde_rm_topology_name { SDE_RM_TOPOLOGY_DUALPIPE_3DMERGE_VDC, SDE_RM_TOPOLOGY_DUALPIPE_DSCMERGE, SDE_RM_TOPOLOGY_PPSPLIT, + SDE_RM_TOPOLOGY_QUADPIPE_3DMERGE, + SDE_RM_TOPOLOGY_QUADPIPE_3DMERGE_DSC, + SDE_RM_TOPOLOGY_QUADPIPE_DSCMERGE, + SDE_RM_TOPOLOGY_QUADPIPE_DSC4HSMERGE, SDE_RM_TOPOLOGY_MAX, };