Commit ee7b62e1 authored by Roman Li's avatar Roman Li Committed by Alex Deucher
Browse files

drm/amd/display: Enable DCN314 in DC 



Add support for DCN 3.1.4 in Display Core

Signed-off-by: default avatarRoman Li <roman.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5439c41a

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

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

DC_LIBS += dcn303

DC_LIBS += dcn31

DC_LIBS += dcn314

DC_LIBS += dcn315

DC_LIBS += dcn316

DC_LIBS += dcn32

drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ bool dal_bios_parser_init_cmd_tbl_helper2( 
	case DCN_VERSION_3_02:

	case DCN_VERSION_3_03:

	case DCN_VERSION_3_1:

	case DCN_VERSION_3_14:

	case DCN_VERSION_3_15:

	case DCN_VERSION_3_16:

	case DCN_VERSION_3_2:

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

+9 −0
Original line number Diff line number Diff line
@@ -154,6 +154,15 @@ AMD_DAL_CLK_MGR_DCN31 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn31/,$(CLK_MGR_DC 


AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN31)



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

# DCN314

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

CLK_MGR_DCN314 = dcn314_smu.o dcn314_clk_mgr.o



AMD_DAL_CLK_MGR_DCN314 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn314/,$(CLK_MGR_DCN314))



AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN314)



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

# DCN315

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

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

+21 −1
Original line number Diff line number Diff line
@@ -43,11 +43,11 @@ 
#include "dcn30/dcn30_clk_mgr.h"

#include "dcn301/vg_clk_mgr.h"

#include "dcn31/dcn31_clk_mgr.h"

#include "dcn314/dcn314_clk_mgr.h"

#include "dcn315/dcn315_clk_mgr.h"

#include "dcn316/dcn316_clk_mgr.h"

#include "dcn32/dcn32_clk_mgr.h"





int clk_mgr_helper_get_active_display_cnt(

		struct dc *dc,

		struct dc_state *context)
@@ -287,6 +287,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: {

		struct clk_mgr_dcn31 *clk_mgr = kzalloc(sizeof(*clk_mgr), GFP_KERNEL);
@@ -335,6 +336,20 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p 
	    return &clk_mgr->base;

	    break;

	}



	case AMDGPU_FAMILY_GC_11_0_2: {

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



		if (clk_mgr == NULL) {

			BREAK_TO_DEBUGGER();

			return NULL;

		}



		dcn314_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg);

		return &clk_mgr->base.base;

	}

	break;



#endif

	default:

		ASSERT(0); /* Unknown Asic */
@@ -381,6 +396,11 @@ void dc_destroy_clk_mgr(struct clk_mgr *clk_mgr_base) 
	case AMDGPU_FAMILY_GC_11_0_0:

		dcn32_clk_mgr_destroy(clk_mgr);

		break;



	case AMDGPU_FAMILY_GC_11_0_2:

		dcn314_clk_mgr_destroy(clk_mgr);

		break;



	default:

		break;

	}

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

+4 −0
Original line number Diff line number Diff line
@@ -4292,6 +4292,10 @@ bool dc_is_dmub_outbox_supported(struct dc *dc) 
	    !dc->debug.dpia_debug.bits.disable_dpia)

		return true;



	if (dc->ctx->asic_id.chip_family == AMDGPU_FAMILY_GC_11_0_2 &&

	    !dc->debug.dpia_debug.bits.disable_dpia)

		return true;



	/* dmub aux needs dmub notifications to be enabled */

	return dc->debug.enable_dmub_aux_for_legacy_ddc;

}