Commit d3dfceb5 authored by Aurabindo Pillai's avatar Aurabindo Pillai Committed by Alex Deucher
Browse files

drm/amd/display: Add dependant changes for DCN32/321 



[Why&How]
This patch adds necessary changes needed in DC files outside DCN32/321
specific tree

v2: squash in updates (Alex)

Signed-off-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 235c6763

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

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ DC_LIBS += dcn303 
DC_LIBS += dcn31

DC_LIBS += dcn315

DC_LIBS += dcn316

DC_LIBS += dcn32

DC_LIBS += dcn321

endif



DC_LIBS += dce120

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

+758 −191

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/amd/display/dc/bios/bios_parser_types_internal2.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ struct object_info_table { 
	struct atom_data_revision revision;

	union {

		struct display_object_info_table_v1_4 *v1_4;

		struct display_object_info_table_v1_5 *v1_5;

	};

};

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

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ bool dal_bios_parser_init_cmd_tbl_helper2( 
	case DCN_VERSION_3_1:

	case DCN_VERSION_3_15:

	case DCN_VERSION_3_16:

	case DCN_VERSION_3_2:

	case DCN_VERSION_3_21:

		*h = dal_cmd_tbl_helper_dce112_get_table2();

		return true;

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

+1 −1
Original line number Diff line number Diff line
@@ -328,8 +328,8 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p 
	    dcn32_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg);

	    return &clk_mgr->base;

	    break;

#endif

	}

#endif

	default:

		ASSERT(0); /* Unknown Asic */

		break;