Skip to content

Commit 44343e8

Browse files
Dmytro Laktyushkinalexdeucher
authored andcommitted
drm/amd/display: prepare dml 2.1 for new asic
[Why&How] prepare dml 2.1 for new asic Acked-by: Wayne Lin <Wayne.Lin@amd.com> Signed-off-by: Dmytro Laktyushkin <dmytro.laktyushkin@amd.com> Signed-off-by: Ray Wu <ray.wu@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 0bfcb56 commit 44343e8

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ struct dc_state *dc_state_create(struct dc *dc, struct dc_state_create_params *p
211211
return NULL;
212212
}
213213

214-
if (!dml2_create(dc, &dc->dml2_dc_power_options, &state->bw_ctx.dml2_dc_power_source)) {
214+
if (dc->caps.dcmode_power_limits_present && !dml2_create(dc, &dc->dml2_dc_power_options, &state->bw_ctx.dml2_dc_power_source)) {
215215
dc_state_release(state);
216216
return NULL;
217217
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ struct dml2_instance;
1616

1717
enum dml2_project_id {
1818
dml2_project_invalid = 0,
19-
dml2_project_dcn4x_stage1 = 1,
20-
dml2_project_dcn4x_stage2 = 2,
21-
dml2_project_dcn4x_stage2_auto_drr_svp = 3,
19+
dml2_project_dcn4x_stage1,
20+
dml2_project_dcn4x_stage2,
21+
dml2_project_dcn4x_stage2_auto_drr_svp,
2222
};
2323

2424
enum dml2_pstate_change_support {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ enum dce_version resource_parse_asic_id(
4545
struct resource_caps {
4646
int num_timing_generator;
4747
int num_opp;
48+
int num_dpp;
4849
int num_video_plane;
4950
int num_audio;
5051
int num_stream_encoder;

0 commit comments

Comments
 (0)