Commit c477eaa6 authored by Hansen Dsouza's avatar Hansen Dsouza Committed by Alex Deucher
Browse files

drm/amd/display: Add DCN316 resource and SMU clock manager 



Add core DC implementation for DCN316.

Reviewed-by: default avatarCharlene Liu <Charlene.Liu@amd.com>
Acked-by: default avatarPrike Liang <Prike.Liang@amd.com>
Reviewed-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarHansen Dsouza <Hansen.Dsouza@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 868f4357

drivers/gpu/drm/amd/display/dc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ DC_LIBS += dcn301 
DC_LIBS += dcn302

DC_LIBS += dcn303

DC_LIBS += dcn31

DC_LIBS += dcn316

endif



DC_LIBS += dce120

drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile

+10 −0
Original line number Diff line number Diff line
@@ -153,4 +153,14 @@ CLK_MGR_DCN31 = dcn31_smu.o dcn31_clk_mgr.o 
AMD_DAL_CLK_MGR_DCN31 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn31/,$(CLK_MGR_DCN31))



AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN31)



###############################################################################

# DCN316

###############################################################################

CLK_MGR_DCN316 = dcn316_smu.o dcn316_clk_mgr.o



AMD_DAL_CLK_MGR_DCN316 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn316/,$(CLK_MGR_DCN316))



AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN316)



endif

drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c

+17 −3
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include "dcn30/dcn30_clk_mgr.h"

#include "dcn301/vg_clk_mgr.h"

#include "dcn31/dcn31_clk_mgr.h"

#include "dcn316/dcn316_clk_mgr.h"





int clk_mgr_helper_get_active_display_cnt(
@@ -278,8 +279,7 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p 
			return &clk_mgr->base.base;

		}

		break;

	case FAMILY_YELLOW_CARP:

	case AMDGPU_FAMILY_GC_10_3_7:{

	case FAMILY_YELLOW_CARP: {

		struct clk_mgr_dcn31 *clk_mgr = kzalloc(sizeof(*clk_mgr), GFP_KERNEL);



		if (clk_mgr == NULL) {
@@ -290,6 +290,17 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p 
		dcn31_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg);

		return &clk_mgr->base.base;

	}

	case AMDGPU_FAMILY_GC_10_3_7: {

		struct clk_mgr_dcn316 *clk_mgr = kzalloc(sizeof(*clk_mgr), GFP_KERNEL);



		if (clk_mgr == NULL) {

			BREAK_TO_DEBUGGER();

			return NULL;

		}



		dcn316_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg);

		return &clk_mgr->base.base;

	}

#endif



	default:
@@ -323,10 +334,13 @@ void dc_destroy_clk_mgr(struct clk_mgr *clk_mgr_base) 
		break;



	case FAMILY_YELLOW_CARP:

	case AMDGPU_FAMILY_GC_10_3_7:

			dcn31_clk_mgr_destroy(clk_mgr);

		break;



	case AMDGPU_FAMILY_GC_10_3_7:

			dcn316_clk_mgr_destroy(clk_mgr);

		break;



	default:

		break;

	}

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c

0 → 100644
+706 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.h

0 → 100644
+49 −0

File added.

Preview size limit exceeded, changes collapsed.