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>

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c b/drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c
index d2046e770c507f3047cdb91244cdbcd483399cf3..82a1152e18b5609c765ad25e1265b4ca838e0f2a 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c
@@ -911,26 +911,14 @@ bool dml2_map_dc_pipes(struct dml2_context *ctx, struct dc_state *state, const s
        unsigned int stream_id;
 
        const unsigned int *ODMMode, *DPPPerSurface;
-       unsigned int odm_mode_array[__DML2_WRAPPER_MAX_STREAMS_PLANES__] = {0}, dpp_per_surface_array[__DML2_WRAPPER_MAX_STREAMS_PLANES__] = {0};
        struct dc_pipe_mapping_scratch scratch;
 
        if (ctx->config.map_dc_pipes_with_callbacks)
                return map_dc_pipes_with_callbacks(
                                ctx, state, disp_cfg, mapping, existing_state);
 
-       if (ctx->architecture == dml2_architecture_21) {
-               /*
-                * Extract ODM and DPP outputs from DML2.1 and map them in an array as required for pipe mapping in dml2_map_dc_pipes.
-                * As data cannot be directly extracted in const pointers, assign these arrays to const pointers before proceeding to
-                * maximize the reuse of existing code. Const pointers are required because dml2.0 dml_display_cfg_st is const.
-                *
-                */
-               ODMMode = (const unsigned int *)odm_mode_array;
-               DPPPerSurface = (const unsigned int *)dpp_per_surface_array;
-       } else {
-               ODMMode = (unsigned int *)disp_cfg->hw.ODMMode;
-               DPPPerSurface = disp_cfg->hw.DPPPerSurface;
-       }
+       ODMMode = (unsigned int *)disp_cfg->hw.ODMMode;
+       DPPPerSurface = disp_cfg->hw.DPPPerSurface;
 
        for (stream_index = 0; stream_index < state->stream_count; stream_index++) {
                memset(&scratch, 0, sizeof(struct dc_pipe_mapping_scratch));

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml2_internal_types.h b/drivers/gpu/drm/amd/display/dc/dml2/dml2_internal_types.h
index ed5b767d46e030cd2a427e79a10c46094b022c4d..df46a866f801859afafa566ab956cacb5ae997db 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml2_internal_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml2_internal_types.h
@@ -104,7 +104,6 @@ struct dml2_helper_det_policy_scratch {
 
 enum dml2_architecture {
        dml2_architecture_20,
-       dml2_architecture_21
 };
 
 struct dml2_context {