Skip to content

Commit 90f2f83

Browse files
Chaitanya Dherealexdeucher
authored andcommitted
drm/amd/display: Remove references to unused dml arch version
Clean-up the code to remove references of all unused dml architecture versions since only dml2 is actively used. Reviewed-by: Jun Lei <jun.lei@amd.com> Acked-by: Hersen Wu <hersenxs.wu@amd.com> Signed-off-by: Chaitanya Dhere <chaitanya.dhere@amd.com> Signed-off-by: Hersen Wu <hersenxs.wu@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 5c10147 commit 90f2f83

2 files changed

Lines changed: 2 additions & 15 deletions

File tree

drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -911,26 +911,14 @@ bool dml2_map_dc_pipes(struct dml2_context *ctx, struct dc_state *state, const s
911911
unsigned int stream_id;
912912

913913
const unsigned int *ODMMode, *DPPPerSurface;
914-
unsigned int odm_mode_array[__DML2_WRAPPER_MAX_STREAMS_PLANES__] = {0}, dpp_per_surface_array[__DML2_WRAPPER_MAX_STREAMS_PLANES__] = {0};
915914
struct dc_pipe_mapping_scratch scratch;
916915

917916
if (ctx->config.map_dc_pipes_with_callbacks)
918917
return map_dc_pipes_with_callbacks(
919918
ctx, state, disp_cfg, mapping, existing_state);
920919

921-
if (ctx->architecture == dml2_architecture_21) {
922-
/*
923-
* Extract ODM and DPP outputs from DML2.1 and map them in an array as required for pipe mapping in dml2_map_dc_pipes.
924-
* As data cannot be directly extracted in const pointers, assign these arrays to const pointers before proceeding to
925-
* maximize the reuse of existing code. Const pointers are required because dml2.0 dml_display_cfg_st is const.
926-
*
927-
*/
928-
ODMMode = (const unsigned int *)odm_mode_array;
929-
DPPPerSurface = (const unsigned int *)dpp_per_surface_array;
930-
} else {
931-
ODMMode = (unsigned int *)disp_cfg->hw.ODMMode;
932-
DPPPerSurface = disp_cfg->hw.DPPPerSurface;
933-
}
920+
ODMMode = (unsigned int *)disp_cfg->hw.ODMMode;
921+
DPPPerSurface = disp_cfg->hw.DPPPerSurface;
934922

935923
for (stream_index = 0; stream_index < state->stream_count; stream_index++) {
936924
memset(&scratch, 0, sizeof(struct dc_pipe_mapping_scratch));

drivers/gpu/drm/amd/display/dc/dml2/dml2_internal_types.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ struct dml2_helper_det_policy_scratch {
104104

105105
enum dml2_architecture {
106106
dml2_architecture_20,
107-
dml2_architecture_21
108107
};
109108

110109
struct dml2_context {

0 commit comments

Comments
 (0)