Commit 44343e8b authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher
Browse files

drm/amd/display: prepare dml 2.1 for new asic 



[Why&How]
prepare dml 2.1 for new asic

Acked-by: default avatarWayne Lin <Wayne.Lin@amd.com>
Signed-off-by: default avatarDmytro Laktyushkin <dmytro.laktyushkin@amd.com>
Signed-off-by: default avatarRay Wu <ray.wu@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0bfcb56e

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

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ struct dc_state *dc_state_create(struct dc *dc, struct dc_state_create_params *p 
			return NULL;

		}



		if (!dml2_create(dc, &dc->dml2_dc_power_options, &state->bw_ctx.dml2_dc_power_source)) {

		if (dc->caps.dcmode_power_limits_present && !dml2_create(dc, &dc->dml2_dc_power_options, &state->bw_ctx.dml2_dc_power_source)) {

			dc_state_release(state);

			return NULL;

		}

drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_types.h

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ struct dml2_instance; 


enum dml2_project_id {

	dml2_project_invalid = 0,

	dml2_project_dcn4x_stage1 = 1,

	dml2_project_dcn4x_stage2 = 2,

	dml2_project_dcn4x_stage2_auto_drr_svp = 3,

	dml2_project_dcn4x_stage1,

	dml2_project_dcn4x_stage2,

	dml2_project_dcn4x_stage2_auto_drr_svp,

};



enum dml2_pstate_change_support {

drivers/gpu/drm/amd/display/dc/inc/resource.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ enum dce_version resource_parse_asic_id( 
struct resource_caps {

	int num_timing_generator;

	int num_opp;

	int num_dpp;

	int num_video_plane;

	int num_audio;

	int num_stream_encoder;