Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7a890df authored by Amine Najahi's avatar Amine Najahi
Browse files

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: default avatarAmine Najahi <anajahi@codeaurora.org>
parent c587442d

msm/sde/sde_connector.c

+4 −0
Original line number Diff line number Diff line
@@ -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"},

msm/sde/sde_rm.c

+8 −0
Original line number Diff line number Diff line
@@ -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 },

};

msm/sde/sde_rm.h

+8 −0
Original line number Diff line number Diff line
@@ -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,

};