Avoids confusion in configurations.
v2: fix build when CONFIG_DRM_AMD_DC_DCN is disabled
v3: rebase on latest code
Reviewed-by: Luben Tuikov <luben.tuikov@amd.com> (v1)
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
        case CHIP_NAVI14:
        case CHIP_NAVI12:
        case CHIP_RENOIR:
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        case CHIP_SIENNA_CICHLID:
        case CHIP_NAVY_FLOUNDER:
        case CHIP_DIMGREY_CAVEFISH:
 
 config DRM_AMD_DC_DCN
        def_bool n
        help
-         Raven, Navi and Renoir family support for display engine
-
-config DRM_AMD_DC_DCN3_0
-        bool "DCN 3.0 family"
-        depends on DRM_AMD_DC && X86
-        depends on DRM_AMD_DC_DCN
-        help
-            Choose this option if you want to have
-            sienna_cichlid support for display engine
-
-config DRM_AMD_DC_DCN3_01
-       bool "DCN 3.01 family"
-       depends on DRM_AMD_DC && X86
-       depends on DRM_AMD_DC_DCN
-       depends on DRM_AMD_DC_DCN3_0
-       help
-           Choose this option if you want to have
-           Van Gogh support for display engine
-
-config DRM_AMD_DC_DCN3_02
-        bool "DCN 3.02 family"
-        depends on DRM_AMD_DC_DCN3_0
-        depends on DRM_AMD_DC_DCN3_01
-        help
-            Choose this option if you want to have
-            Dimgrey_cavefish support for display engine
+         Raven, Navi, and newer family support for display engine
 
 config DRM_AMD_DC_HDCP
        bool "Enable HDCP support in DC"
 
 
 #define FIRMWARE_RENOIR_DMUB "amdgpu/renoir_dmcub.bin"
 MODULE_FIRMWARE(FIRMWARE_RENOIR_DMUB);
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 #define FIRMWARE_SIENNA_CICHLID_DMUB "amdgpu/sienna_cichlid_dmcub.bin"
 MODULE_FIRMWARE(FIRMWARE_SIENNA_CICHLID_DMUB);
 #define FIRMWARE_NAVY_FLOUNDER_DMUB "amdgpu/navy_flounder_dmcub.bin"
 MODULE_FIRMWARE(FIRMWARE_NAVY_FLOUNDER_DMUB);
-#endif
 #define FIRMWARE_GREEN_SARDINE_DMUB "amdgpu/green_sardine_dmcub.bin"
 MODULE_FIRMWARE(FIRMWARE_GREEN_SARDINE_DMUB);
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
 #define FIRMWARE_VANGOGH_DMUB "amdgpu/vangogh_dmcub.bin"
 MODULE_FIRMWARE(FIRMWARE_VANGOGH_DMUB);
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
 #define FIRMWARE_DIMGREY_CAVEFISH_DMUB "amdgpu/dimgrey_cavefish_dmcub.bin"
 MODULE_FIRMWARE(FIRMWARE_DIMGREY_CAVEFISH_DMUB);
-#endif
 
 #define FIRMWARE_RAVEN_DMCU            "amdgpu/raven_dmcu.bin"
 MODULE_FIRMWARE(FIRMWARE_RAVEN_DMCU);
        case CHIP_NAVI10:
        case CHIP_NAVI14:
        case CHIP_RENOIR:
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        case CHIP_SIENNA_CICHLID:
        case CHIP_NAVY_FLOUNDER:
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
        case CHIP_DIMGREY_CAVEFISH:
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
        case CHIP_VANGOGH:
-#endif
                return 0;
        case CHIP_NAVI12:
                fw_name_dmcu = FIRMWARE_NAVI12_DMCU;
                if (ASICREV_IS_GREEN_SARDINE(adev->external_rev_id))
                        fw_name_dmub = FIRMWARE_GREEN_SARDINE_DMUB;
                break;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        case CHIP_SIENNA_CICHLID:
                dmub_asic = DMUB_ASIC_DCN30;
                fw_name_dmub = FIRMWARE_SIENNA_CICHLID_DMUB;
                dmub_asic = DMUB_ASIC_DCN30;
                fw_name_dmub = FIRMWARE_NAVY_FLOUNDER_DMUB;
                break;
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
        case CHIP_VANGOGH:
                dmub_asic = DMUB_ASIC_DCN301;
                fw_name_dmub = FIRMWARE_VANGOGH_DMUB;
                break;
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
        case CHIP_DIMGREY_CAVEFISH:
                dmub_asic = DMUB_ASIC_DCN302;
                fw_name_dmub = FIRMWARE_DIMGREY_CAVEFISH_DMUB;
                break;
-#endif
 
        default:
                /* ASIC doesn't support DMUB. */
        case CHIP_NAVI10:
        case CHIP_NAVI14:
        case CHIP_RENOIR:
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        case CHIP_SIENNA_CICHLID:
        case CHIP_NAVY_FLOUNDER:
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
        case CHIP_DIMGREY_CAVEFISH:
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
        case CHIP_VANGOGH:
-#endif
                if (dcn10_register_irq_handlers(dm->adev)) {
                        DRM_ERROR("DM: Failed to initialize IRQ\n");
                        goto fail;
                break;
 #if defined(CONFIG_DRM_AMD_DC_DCN)
        case CHIP_RAVEN:
+       case CHIP_RENOIR:
+       case CHIP_VANGOGH:
                adev->mode_info.num_crtc = 4;
                adev->mode_info.num_hpd = 4;
                adev->mode_info.num_dig = 4;
                break;
-#endif
        case CHIP_NAVI10:
        case CHIP_NAVI12:
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        case CHIP_SIENNA_CICHLID:
        case CHIP_NAVY_FLOUNDER:
-#endif
                adev->mode_info.num_crtc = 6;
                adev->mode_info.num_hpd = 6;
                adev->mode_info.num_dig = 6;
                break;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
-       case CHIP_VANGOGH:
-               adev->mode_info.num_crtc = 4;
-               adev->mode_info.num_hpd = 4;
-               adev->mode_info.num_dig = 4;
-               break;
-#endif
        case CHIP_NAVI14:
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
        case CHIP_DIMGREY_CAVEFISH:
-#endif
                adev->mode_info.num_crtc = 5;
                adev->mode_info.num_hpd = 5;
                adev->mode_info.num_dig = 5;
                break;
-       case CHIP_RENOIR:
-               adev->mode_info.num_crtc = 4;
-               adev->mode_info.num_hpd = 4;
-               adev->mode_info.num_dig = 4;
-               break;
+#endif
        default:
                DRM_ERROR("Unsupported ASIC type: 0x%X\n", adev->asic_type);
                return -EINVAL;
        tiling_info->gfx9.num_rb_per_se =
                adev->gfx.config.gb_addr_config_fields.num_rb_per_se;
        tiling_info->gfx9.shaderEnable = 1;
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
        if (adev->asic_type == CHIP_SIENNA_CICHLID ||
            adev->asic_type == CHIP_NAVY_FLOUNDER ||
            adev->asic_type == CHIP_DIMGREY_CAVEFISH ||
            adev->asic_type == CHIP_VANGOGH)
                tiling_info->gfx9.num_pkrs = adev->gfx.config.gb_addr_config_fields.num_pkrs;
-#endif
 }
 
 static int
 
 {
        /* TODO: something */
 }
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
 
 void *dm_helpers_allocate_gpu_mem(
                struct dc_context *ctx,
 {
        // TODO
 }
-#endif
 
 DC_LIBS += dsc
 DC_LIBS += dcn10 dml
 DC_LIBS += dcn21
-endif
-
-ifdef CONFIG_DRM_AMD_DC_DCN3_0
 DC_LIBS += dcn30
-endif
-
-ifdef CONFIG_DRM_AMD_DC_DCN3_01
 DC_LIBS += dcn301
-endif
-
-ifdef CONFIG_DRM_AMD_DC_DCN3_02
 DC_LIBS += dcn302
-
 endif
 
 DC_LIBS += dce120
 
                                result = get_firmware_info_v3_1(bp, info);
                                break;
                        case 2:
-                               result = get_firmware_info_v3_2(bp, info);
-                               break;
                        case 3:
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
                        case 4:
-#endif
                                result = get_firmware_info_v3_2(bp, info);
                                break;
                        default:
        return BP_RESULT_OK;
 }
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
 static enum bp_result get_integrated_info_v2_1(
        struct bios_parser *bp,
        struct integrated_info *info)
 
        return BP_RESULT_OK;
 }
-#endif
 
 /*
  * construct_integrated_info
 
                get_atom_data_table_revision(header, &revision);
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
                switch (revision.major) {
                case 1:
                        switch (revision.minor) {
                default:
                        return result;
                }
-#else
-               /* Don't need to check major revision as they are all 1 */
-               switch (revision.minor) {
-               case 11:
-               case 12:
-                       result = get_integrated_info_v11(bp, info);
-                       break;
-               default:
-                       return result;
-               }
-#endif
        }
 
        if (result != BP_RESULT_OK)
 
        case DCN_VERSION_1_01:
        case DCN_VERSION_2_0:
        case DCN_VERSION_2_1:
-               *h = dal_cmd_tbl_helper_dce112_get_table2();
-               return true;
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        case DCN_VERSION_3_0:
-               *h = dal_cmd_tbl_helper_dce112_get_table2();
-               return true;
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
        case DCN_VERSION_3_01:
-               *h = dal_cmd_tbl_helper_dce112_get_table2();
-               return true;
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
        case DCN_VERSION_3_02:
                *h = dal_cmd_tbl_helper_dce112_get_table2();
                return true;
 
                input->src.viewport_width_c    = input->src.viewport_width;
                input->src.viewport_height_c   = input->src.viewport_height;
                break;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        case SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA:
                input->src.source_format = dm_rgbe_alpha;
                input->src.viewport_width_c    = input->src.viewport_width;
                input->src.viewport_height_c   = input->src.viewport_height;
                break;
-#endif
        default:
                input->src.source_format = dm_444_32;
                input->src.viewport_width_c    = input->src.viewport_width;
 
 AMD_DAL_CLK_MGR_DCN21 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn21/,$(CLK_MGR_DCN21))
 
 AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN21)
-endif
-ifdef CONFIG_DRM_AMD_DC_DCN3_0
 ###############################################################################
 # DCN30
 ###############################################################################
 AMD_DAL_CLK_MGR_DCN30 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn30/,$(CLK_MGR_DCN30))
 
 AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN30)
-endif
-ifdef CONFIG_DRM_AMD_DC_DCN3_01
 ###############################################################################
 # DCN301
 ###############################################################################
 
 #include "dcn10/rv2_clk_mgr.h"
 #include "dcn20/dcn20_clk_mgr.h"
 #include "dcn21/rn_clk_mgr.h"
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 #include "dcn30/dcn30_clk_mgr.h"
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
 #include "dcn301/vg_clk_mgr.h"
-#endif
 
 
 int clk_mgr_helper_get_active_display_cnt(
                break;
 
        case FAMILY_NV:
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
                if (ASICREV_IS_SIENNA_CICHLID_P(asic_id.hw_internal_rev)) {
                        dcn3_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg);
                        break;
                }
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
                if (ASICREV_IS_DIMGREY_CAVEFISH_P(asic_id.hw_internal_rev)) {
                        dcn3_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg);
                        break;
                }
-#endif
-#endif
                dcn20_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg);
                break;
-#endif /* Family RV and NV*/
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
        case FAMILY_VGH:
                if (ASICREV_IS_VANGOGH(asic_id.hw_internal_rev))
                        vg_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg);
 void dc_destroy_clk_mgr(struct clk_mgr *clk_mgr_base)
 {
        struct clk_mgr_internal *clk_mgr = TO_CLK_MGR_INTERNAL(clk_mgr_base);
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
 
+#ifdef CONFIG_DRM_AMD_DC_DCN
        switch (clk_mgr_base->ctx->asic_id.chip_family) {
        case FAMILY_NV:
                if (ASICREV_IS_SIENNA_CICHLID_P(clk_mgr_base->ctx->asic_id.hw_internal_rev)) {
                }
                break;
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
        case FAMILY_VGH:
                if (ASICREV_IS_VANGOGH(clk_mgr_base->ctx->asic_id.hw_internal_rev))
                        vg_clk_mgr_destroy(clk_mgr);
                break;
-#endif
 
        default:
                break;
 
        dc->clk_mgr = dc_clk_mgr_create(dc->ctx, dc->res_pool->pp_smu, dc->res_pool->dccg);
        if (!dc->clk_mgr)
                goto fail;
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
+#ifdef CONFIG_DRM_AMD_DC_DCN
        dc->clk_mgr->force_smu_not_present = init_params->force_smu_not_present;
 #endif
 
        int i, k, l;
        struct dc_stream_state *dc_streams[MAX_STREAMS] = {0};
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        dc_allow_idle_optimizations(dc, false);
 #endif
 
        return (result == DC_OK);
 }
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 bool dc_acquire_release_mpc_3dlut(
                struct dc *dc, bool acquire,
                struct dc_stream_state *stream,
        int i;
        enum surface_update_type overall_type = UPDATE_TYPE_FAST;
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        if (dc->idle_optimizations_allowed)
                overall_type = UPDATE_TYPE_FULL;
 
        }
 
        if (update_type == UPDATE_TYPE_FULL) {
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
                dc_allow_idle_optimizations(dc, false);
 
 #endif
        return true;
 }
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 
 void dc_allow_idle_optimizations(struct dc *dc, bool allow)
 {
 
        struct dc *dc = pipe_ctx->stream->ctx->dc;
        struct dc_stream_state *stream = pipe_ctx->stream;
        enum dc_status status;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        enum otg_out_mux_dest otg_out_dest = OUT_MUX_DIO;
 #endif
        DC_LOGGER_INIT(pipe_ctx->stream->ctx->logger);
 
        pipe_ctx->stream->link->link_state_valid = true;
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        if (pipe_ctx->stream_res.tg->funcs->set_out_mux)
                pipe_ctx->stream_res.tg->funcs->set_out_mux(pipe_ctx->stream_res.tg, otg_out_dest);
 #endif
 
 #include "dcn10/dcn10_resource.h"
 #include "dcn20/dcn20_resource.h"
 #include "dcn21/dcn21_resource.h"
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
-#include "../dcn30/dcn30_resource.h"
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
-#include "../dcn301/dcn301_resource.h"
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
-#include "../dcn302/dcn302_resource.h"
+#include "dcn30/dcn30_resource.h"
+#include "dcn301/dcn301_resource.h"
+#include "dcn302/dcn302_resource.h"
 #endif
 
 #define DC_LOGGER_INIT(logger)
                if (ASICREV_IS_GREEN_SARDINE(asic_id.hw_internal_rev))
                        dc_version = DCN_VERSION_2_1;
                break;
-#endif
 
        case FAMILY_NV:
                dc_version = DCN_VERSION_2_0;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
                if (ASICREV_IS_SIENNA_CICHLID_P(asic_id.hw_internal_rev))
                        dc_version = DCN_VERSION_3_0;
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
                if (ASICREV_IS_DIMGREY_CAVEFISH_P(asic_id.hw_internal_rev))
                        dc_version = DCN_VERSION_3_02;
-#endif
                break;
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
        case FAMILY_VGH:
                dc_version = DCN_VERSION_3_01;
                break;
        case DCN_VERSION_1_01:
                res_pool = dcn10_create_resource_pool(init_data, dc);
                break;
-
-
        case DCN_VERSION_2_0:
                res_pool = dcn20_create_resource_pool(init_data, dc);
                break;
        case DCN_VERSION_2_1:
                res_pool = dcn21_create_resource_pool(init_data, dc);
                break;
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        case DCN_VERSION_3_0:
                res_pool = dcn30_create_resource_pool(init_data, dc);
                break;
-#endif
-
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
        case DCN_VERSION_3_01:
                res_pool = dcn301_create_resource_pool(init_data, dc);
                break;
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
        case DCN_VERSION_3_02:
                res_pool = dcn302_create_resource_pool(init_data, dc);
                break;
-
 #endif
        default:
                break;
                }
        }
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        for (i = 0; i < caps->num_mpc_3dlut; i++) {
                pool->mpc_lut[i] = dc_create_3dlut_func();
                if (pool->mpc_lut[i] == NULL)
 
        /* Add ABM to the resource if on EDP */
        if (pipe_ctx->stream && dc_is_embedded_signal(pipe_ctx->stream->signal)) {
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
                if (pool->abm)
                        pipe_ctx->stream_res.abm = pool->abm;
                else
        case SURFACE_PIXEL_FORMAT_GRPH_ARGB2101010:
        case SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010:
        case SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010_XR_BIAS:
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        case SURFACE_PIXEL_FORMAT_GRPH_RGBE:
        case SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA:
 #endif
 
        struct dc  *dc;
        struct resource_context *res_ctx;
        struct pipe_ctx *pipe_to_program = NULL;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        bool reset_idle_optimizations = false;
 #endif
 
        res_ctx = &dc->current_state->res_ctx;
        stream->cursor_attributes = *attributes;
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        /* disable idle optimizations while updating cursor */
        if (dc->idle_optimizations_allowed) {
                dc_allow_idle_optimizations(dc, false);
        if (pipe_to_program)
                dc->hwss.cursor_lock(dc, pipe_to_program, false);
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        /* re-enable idle optimizations if necessary */
        if (reset_idle_optimizations)
                dc_allow_idle_optimizations(dc, true);
        struct dc  *dc;
        struct resource_context *res_ctx;
        struct pipe_ctx *pipe_to_program = NULL;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        bool reset_idle_optimizations = false;
 #endif
 
 
        dc = stream->ctx->dc;
        res_ctx = &dc->current_state->res_ctx;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 
        /* disable idle optimizations if enabling cursor */
        if (dc->idle_optimizations_allowed && !stream->cursor_position.enable && position->enable) {
        if (pipe_to_program)
                dc->hwss.cursor_lock(dc, pipe_to_program, false);
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        /* re-enable idle optimizations if necessary */
        if (reset_idle_optimizations)
                dc_allow_idle_optimizations(dc, true);
 
        unsigned int max_compressed_blk_size;
        unsigned int max_uncompressed_blk_size;
        bool independent_64b_blks;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        //These bitfields to be used starting with DCN 3.0
        struct {
                uint32_t dcc_256_64_64 : 1;//available in ASICs before DCN 3.0 (the worst compression case)
        bool multi_mon_pp_mclk_switch;
        bool disable_dmcu;
        bool enable_4to1MPC;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        bool clamp_min_dcfclk;
 #endif
 };
        bool edid_read_retry_times;
        bool remove_disconnect_edp;
        unsigned int force_odm_combine; //bit vector based on otg inst
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        unsigned int force_odm_combine_4to1; //bit vector based on otg inst
 #endif
        unsigned int force_fclk_khz;
        bool enable_tri_buf;
        bool dmub_offload_enabled;
        bool dmcub_emulation;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        bool disable_idle_power_optimizations;
 #endif
        bool dmub_command_table; /* for testing only */
         * watermarks are not affected.
         */
        unsigned int force_min_dcfclk_mhz;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        int dwb_fi_phase;
 #endif
        bool disable_timing_sync;
        /* Require to optimize clocks and bandwidth for added/removed planes */
        bool optimized_required;
        bool wm_optimized_required;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        bool idle_optimizations_allowed;
 #endif
 
         */
        const struct gpu_info_soc_bounding_box_v1_0 *soc_bounding_box;
        struct dpcd_vendor_signature vendor_signature;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        bool force_smu_not_present;
 #endif
        bool force_ignore_link_settings;
        struct dc_transfer_func *in_shaper_func;
        struct dc_transfer_func *blend_tf;
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        struct dc_transfer_func *gamcor_tf;
 #endif
        enum surface_pixel_format format;
                const struct dc *dc,
                struct dc_state *dst_ctx);
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 bool dc_acquire_release_mpc_3dlut(
                struct dc *dc, bool acquire,
                struct dc_stream_state *stream,
 
 #include "dc_link.h"
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 uint32_t dc_get_opp_for_plane(struct dc *dc, struct dc_plane_state *plane);
 
 #endif
 
 enum dc_status dc_set_clock(struct dc *dc, enum dc_clock_type clock_type, uint32_t clk_khz, uint32_t stepping);
 void dc_get_clock(struct dc *dc, enum dc_clock_type clock_type, struct dc_clock_config *clock_cfg);
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 
 bool dc_is_plane_eligible_for_idle_optimizations(struct dc *dc,
                                                 struct dc_plane_state *plane);
 
        PLN_ADDR_TYPE_GRAPHICS = 0,
        PLN_ADDR_TYPE_GRPH_STEREO,
        PLN_ADDR_TYPE_VIDEO_PROGRESSIVE,
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        PLN_ADDR_TYPE_RGBEA
-#endif
 };
 
 struct dc_plane_address {
                        PHYSICAL_ADDRESS_LOC right_meta_addr;
                        union large_integer right_dcc_const_color;
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
                        PHYSICAL_ADDRESS_LOC left_alpha_addr;
                        PHYSICAL_ADDRESS_LOC left_alpha_meta_addr;
                        union large_integer left_alpha_dcc_const_color;
                        PHYSICAL_ADDRESS_LOC right_alpha_addr;
                        PHYSICAL_ADDRESS_LOC right_alpha_meta_addr;
                        union large_integer right_alpha_dcc_const_color;
-#endif
 
                } grph_stereo;
 
                        union large_integer chroma_dcc_const_color;
                } video_progressive;
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
                struct {
                        PHYSICAL_ADDRESS_LOC addr;
                        PHYSICAL_ADDRESS_LOC meta_addr;
                        PHYSICAL_ADDRESS_LOC alpha_meta_addr;
                        union large_integer alpha_dcc_const_color;
                } rgbea;
-#endif
        };
 
        union large_integer page_table_base;
 
        int meta_pitch;
        bool independent_64b_blks;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        uint8_t dcc_ind_blk;
-#endif
 
        int meta_pitch_c;
        bool independent_64b_blks_c;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        uint8_t dcc_ind_blk_c;
-#endif
 };
 
 /*Displayable pixel format in fb*/
        SURFACE_PIXEL_FORMAT_GRPH_BGR101111_FIX,
        SURFACE_PIXEL_FORMAT_GRPH_RGB111110_FLOAT,
        SURFACE_PIXEL_FORMAT_GRPH_BGR101111_FLOAT,
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        SURFACE_PIXEL_FORMAT_GRPH_RGBE,
        SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA,
-#endif
        SURFACE_PIXEL_FORMAT_VIDEO_BEGIN,
        SURFACE_PIXEL_FORMAT_VIDEO_420_YCbCr =
                SURFACE_PIXEL_FORMAT_VIDEO_BEGIN,
        DWB_STEREO_TYPE_FRAME_SEQUENTIAL = 3,   /* Frame sequential */
 };
 
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
-
 enum dwb_out_format {
        DWB_OUT_FORMAT_32BPP_ARGB = 0,
        DWB_OUT_FORMAT_32BPP_RGBA = 1,
        unsigned int            p_vmid;
 };
 
-#endif
-
 #define MCIF_BUF_COUNT 4
 
 struct mcif_buf_params {
        unsigned int            chroma_pitch;
        unsigned int            warmup_pitch;
        unsigned int            swlock;
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
        unsigned int            p_vmid;
-#endif
 };
 
 
 
        int dwb_pipe_inst;
        struct dc_dwb_params dwb_params;
        struct mcif_buf_params mcif_buf_params;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        struct mcif_warmup_params mcif_warmup_params;
        /* the plane that is the input to TOP_MUX for MPCC that is the DWB source */
        struct dc_plane_state *writeback_source_plane;
        /* source MPCC instance.  for use by internally by dc */
        int mpcc_inst;
-#endif
 };
 
 struct dc_writeback_update {
        /* writeback */
        unsigned int num_wb_info;
        struct dc_writeback_info writeback_info[MAX_DWB_PIPES];
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        const struct dc_transfer_func *func_shaper;
        const struct dc_3dlut *lut3d_func;
-#endif
        /* Computed state bits */
        bool mode_changed : 1;
 
 
        struct dc_writeback_update *wb_update;
        struct dc_dsc_config *dsc_config;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        struct dc_transfer_func *func_shaper;
        struct dc_3dlut *lut3d_func;
-#endif
 };
 
 bool dc_is_stream_unchanged(
 
        DISPLAY_CONTENT_TYPE_GAME = 8
 };
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 enum cm_gamut_adjust_type {
        CM_GAMUT_ADJUST_TYPE_BYPASS = 0,
        CM_GAMUT_ADJUST_TYPE_HW, /* without adjustments */
        enum cm_gamut_adjust_type gamut_adjust_type;
        enum cm_gamut_coef_format gamut_coef_format;
 };
-#endif
+
 /* writeback */
 struct dwb_stereo_params {
        bool                            stereo_enabled;         /* false: normal mode, true: 3D stereo */
        unsigned int            crop_x;         /* cropped window start x value at cnv output */
        unsigned int            crop_y;         /* cropped window start y value at cnv output */
        enum dwb_cnv_out_bpc cnv_out_bpc;       /* cnv output pixel depth - 8bpc or 10bpc */
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        enum dwb_out_format     fc_out_format;  /* dwb output pixel format - 2101010 or 16161616 and ARGB or RGBA */
        enum dwb_out_denorm     out_denorm_mode;/* dwb output denormalization mode */
        unsigned int            out_max_pix_val;/* pixel values greater than out_max_pix_val are clamped to out_max_pix_val */
        unsigned int            out_min_pix_val;/* pixel values less than out_min_pix_val are clamped to out_min_pix_val */
-#endif
 };
 
 struct dc_dwb_params {
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        unsigned int                    dwbscl_black_color; /* must be in FP1.5.10 */
        unsigned int                    hdr_mult;       /* must be in FP1.6.12 */
        struct cm_grph_csc_adjustment   csc_params;
        struct dwb_stereo_params        stereo_params;
-#endif
        struct dc_dwb_cnv_params        cnv_params;     /* CNV source size and cropping window parameters */
        unsigned int                    dest_width;     /* Destination width */
        unsigned int                    dest_height;    /* Destination height */
        uint32_t dc_gpio_aux_ctrl_5_val;
 };
 
-
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 enum dc_gpu_mem_alloc_type {
        DC_MEM_ALLOC_TYPE_GART,
        DC_MEM_ALLOC_TYPE_FRAME_BUFFER,
        DC_MEM_ALLOC_TYPE_AGP
 };
 
-#endif
 enum dc_psr_version {
        DC_PSR_VERSION_1                        = 0,
        DC_PSR_VERSION_UNSUPPORTED              = 0xFFFFFFFF,
 
        SR(DC_ABM1_ACE_THRES_12), \
        NBIO_SR(BIOS_SCRATCH_2)
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
 #define ABM_DCN301_REG_LIST(id)\
        ABM_COMMON_REG_LIST_DCE_BASE(), \
        SRI(DC_ABM1_HG_SAMPLE_RATE, ABM, id), \
        SRI(DC_ABM1_LS_MIN_MAX_PIXEL_VALUE_THRES, ABM, id), \
        SRI(DC_ABM1_HGLS_REG_READ_PROGRESS, ABM, id), \
        NBIO_SR(BIOS_SCRATCH_2)
-#endif
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 #define ABM_DCN30_REG_LIST(id)\
        ABM_COMMON_REG_LIST_DCE_BASE(), \
        SRI(DC_ABM1_HG_SAMPLE_RATE, ABM, id), \
        SRI(DC_ABM1_ACE_OFFSET_SLOPE_0, ABM, id), \
        SRI(DC_ABM1_ACE_THRES_12, ABM, id), \
        NBIO_SR(BIOS_SCRATCH_2)
-#endif
 
 #define ABM_SF(reg_name, field_name, post_fix)\
        .field_name = reg_name ## __ ## field_name ## post_fix
 
 #define ABM_MASK_SH_LIST_DCN20(mask_sh) ABM_MASK_SH_LIST_DCE110(mask_sh)
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 #define ABM_MASK_SH_LIST_DCN30(mask_sh) ABM_MASK_SH_LIST_DCN10(mask_sh)
-#endif
 
 #define ABM_REG_FIELD_LIST(type) \
        type ABM1_HG_NUM_OF_BINS_SEL; \
 
        return false;
 }
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 /* this table is use to find *1.001 and /1.001 pixel rates from non-precise pixel rate */
 const struct pixel_rate_range_table_entry video_optimized_pixel_rates[] = {
        // /1.001 rates
        .get_pixel_clk_frequency_100hz = get_pixel_clk_frequency_100hz
 };
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 static bool dcn3_program_pix_clk(
                struct clock_source *clock_source,
                struct pixel_clk_params *pix_clk_params,
        return ret;
 }
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 bool dcn3_clk_src_construct(
        struct dce110_clk_src *clk_src,
        struct dc_context *ctx,
 }
 #endif
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 bool dcn301_clk_src_construct(
        struct dce110_clk_src *clk_src,
        struct dc_context *ctx,
 
                SRII(PIXEL_RATE_CNTL, OTG, 2),\
                SRII(PIXEL_RATE_CNTL, OTG, 3)
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 #define CS_COMMON_REG_LIST_DCN3_0(index, pllid) \
                SRI(PIXCLK_RESYNC_CNTL, PHYPLL, pllid),\
                SRII(PHASE, DP_DTO, 0),\
                SRII(PIXEL_RATE_CNTL, OTG, 1),\
                SRII(PIXEL_RATE_CNTL, OTG, 2),\
                SRII(PIXEL_RATE_CNTL, OTG, 3)
-#endif
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
 #define CS_COMMON_REG_LIST_DCN3_01(index, pllid) \
                SRI(PIXCLK_RESYNC_CNTL, PHYPLL, pllid),\
                SRII(PHASE, DP_DTO, 0),\
                SRII(PIXEL_RATE_CNTL, OTG, 3)
 #endif
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 #define CS_COMMON_REG_LIST_DCN3_02(index, pllid) \
                SRI(PIXCLK_RESYNC_CNTL, PHYPLL, pllid),\
                SRII(PHASE, DP_DTO, 0),\
        const struct dce110_clk_src_shift *cs_shift,
        const struct dce110_clk_src_mask *cs_mask);
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 bool dcn3_clk_src_construct(
        struct dce110_clk_src *clk_src,
        struct dc_context *ctx,
        const struct dce110_clk_src_regs *regs,
        const struct dce110_clk_src_shift *cs_shift,
        const struct dce110_clk_src_mask *cs_mask);
-#endif
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
 bool dcn301_clk_src_construct(
        struct dce110_clk_src *clk_src,
        struct dc_context *ctx,
        unsigned short div_factor;
 };
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 extern const struct pixel_rate_range_table_entry video_optimized_pixel_rates[];
 const struct pixel_rate_range_table_entry *look_up_in_video_optimized_rate_tlb(
                unsigned int pixel_rate_khz);
 
        SRII(PHYPLL_PIXEL_RATE_CNTL, blk, 4), \
        SRII(PHYPLL_PIXEL_RATE_CNTL, blk, 5)
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 #define HWSEQ_PIXEL_RATE_REG_LIST_3(blk) \
        SRII(PIXEL_RATE_CNTL, blk, 0), \
        SRII(PIXEL_RATE_CNTL, blk, 1),\
        SRII(PHYPLL_PIXEL_RATE_CNTL, blk, 3), \
        SRII(PHYPLL_PIXEL_RATE_CNTL, blk, 4), \
        SRII(PHYPLL_PIXEL_RATE_CNTL, blk, 5)
-#endif
 
 #define HWSEQ_DCE11_REG_LIST_BASE() \
        SR(DC_MEM_GLOBAL_PWR_REQ_CNTL), \
        SR(D6VGA_CONTROL), \
        SR(DC_IP_REQUEST_CNTL)
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 #define HWSEQ_DCN30_REG_LIST()\
        HWSEQ_DCN2_REG_LIST(),\
        HWSEQ_DCN_REG_LIST(), \
        SR(MPC_CRC_RESULT_AR), \
        SR(AZALIA_AUDIO_DTO), \
        SR(AZALIA_CONTROLLER_CLOCK_GATING)
-#endif
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
 #define HWSEQ_DCN301_REG_LIST()\
        SR(REFCLK_CNTL), \
        SR(DCHUBBUB_GLOBAL_TIMER_CNTL), \
        SR(DC_IP_REQUEST_CNTL), \
        SR(AZALIA_AUDIO_DTO), \
        SR(AZALIA_CONTROLLER_CLOCK_GATING)
-#endif
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
 #define HWSEQ_DCN302_REG_LIST()\
        HWSEQ_DCN_REG_LIST(), \
        HSWEQ_DCN_PIXEL_RATE_REG_LIST(OTG, 0), \
        SR(AZALIA_AUDIO_DTO), \
        SR(AZALIA_CONTROLLER_CLOCK_GATING)
 
-#endif
-
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
-
 #define HWSEQ_PIXEL_RATE_REG_LIST_302(blk) \
        SRII(PIXEL_RATE_CNTL, blk, 0), \
        SRII(PIXEL_RATE_CNTL, blk, 1),\
        SRII(PHYPLL_PIXEL_RATE_CNTL, blk, 2),\
        SRII(PHYPLL_PIXEL_RATE_CNTL, blk, 3), \
        SRII(PHYPLL_PIXEL_RATE_CNTL, blk, 4)
-#endif
 
 struct dce_hwseq_registers {
        uint32_t DCFE_CLOCK_CONTROL[6];
        uint32_t MC_VM_XGMI_LFB_CNTL;
        uint32_t AZALIA_AUDIO_DTO;
        uint32_t AZALIA_CONTROLLER_CLOCK_GATING;
- #if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        uint32_t HPO_TOP_CLOCK_CONTROL;
        uint32_t ODM_MEM_PWR_CTRL3;
- #endif
 };
  /* set field name */
 #define HWS_SF(blk_name, reg_name, field_name, post_fix)\
        HWS_SF(, DOMAIN18_PG_STATUS, DOMAIN18_PGFSM_PWR_STATUS, mask_sh), \
        HWS_SF(, DC_IP_REQUEST_CNTL, IP_REQUEST_EN, mask_sh)
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 #define HWSEQ_DCN30_MASK_SH_LIST(mask_sh)\
        HWSEQ_DCN2_MASK_SH_LIST(mask_sh), \
        HWS_SF(, AZALIA_AUDIO_DTO, AZALIA_AUDIO_DTO_MODULE, mask_sh), \
        HWS_SF(, ODM_MEM_PWR_CTRL3, ODM_MEM_UNASSIGNED_PWR_MODE, mask_sh), \
        HWS_SF(, ODM_MEM_PWR_CTRL3, ODM_MEM_VBLANK_PWR_MODE, mask_sh)
-#endif
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
 #define HWSEQ_DCN301_MASK_SH_LIST(mask_sh)\
        HWSEQ_DCN_MASK_SH_LIST(mask_sh), \
        HWS_SF(, DCHUBBUB_GLOBAL_TIMER_CNTL, DCHUBBUB_GLOBAL_TIMER_REFDIV, mask_sh), \
        HWS_SF(, PANEL_PWRSEQ0_CNTL, PANEL_DIGON_OVRD, mask_sh),\
        HWS_SF(, PANEL_PWRSEQ0_STATE, PANEL_PWRSEQ_TARGET_STATE_R, mask_sh),\
        HWS_SF(, AZALIA_AUDIO_DTO, AZALIA_AUDIO_DTO_MODULE, mask_sh)
-#endif
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
 #define HWSEQ_DCN302_MASK_SH_LIST(mask_sh)\
        HWSEQ_DCN_MASK_SH_LIST(mask_sh), \
        HWS_SF(, DCHUBBUB_GLOBAL_TIMER_CNTL, DCHUBBUB_GLOBAL_TIMER_REFDIV, mask_sh), \
        HWS_SF(, DC_IP_REQUEST_CNTL, IP_REQUEST_EN, mask_sh), \
        HWS_SF(, AZALIA_AUDIO_DTO, AZALIA_AUDIO_DTO_MODULE, mask_sh)
 
-#endif
-
 #define HWSEQ_REG_FIELD_LIST(type) \
        type DCFE_CLOCK_ENABLE; \
        type DCFEV_CLOCK_ENABLE; \
        type ODM_MEM_UNASSIGNED_PWR_MODE; \
        type ODM_MEM_VBLANK_PWR_MODE;
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 #define HWSEQ_DCN3_REG_FIELD_LIST(type) \
        type HPO_HDMISTREAMCLK_GATE_DIS;
-#endif
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
 #define HWSEQ_DCN301_REG_FIELD_LIST(type) \
        type PANEL_BLON;\
        type PANEL_DIGON;\
        type PANEL_DIGON_OVRD;\
        type PANEL_PWRSEQ_TARGET_STATE_R;
-#endif
 
 struct dce_hwseq_shift {
        HWSEQ_REG_FIELD_LIST(uint8_t)
        HWSEQ_DCN_REG_FIELD_LIST(uint8_t)
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        HWSEQ_DCN3_REG_FIELD_LIST(uint8_t)
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
        HWSEQ_DCN301_REG_FIELD_LIST(uint8_t)
-#endif
 };
 
 struct dce_hwseq_mask {
        HWSEQ_REG_FIELD_LIST(uint32_t)
        HWSEQ_DCN_REG_FIELD_LIST(uint32_t)
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        HWSEQ_DCN3_REG_FIELD_LIST(uint32_t)
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
        HWSEQ_DCN301_REG_FIELD_LIST(uint32_t)
-#endif
 };
 
 
 
                REG_UPDATE(DCSURF_SURFACE_CONFIG,
                                SURFACE_PIXEL_FORMAT, 119);
                break;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        case SURFACE_PIXEL_FORMAT_GRPH_RGBE:
                REG_UPDATE_2(DCSURF_SURFACE_CONFIG,
                                SURFACE_PIXEL_FORMAT, 116,
                                SURFACE_PIXEL_FORMAT, 116,
                                ALPHA_PLANE_EN, 1);
                break;
-#endif
        default:
                BREAK_TO_DEBUGGER();
                break;
 
        uint32_t RAWLANE2_DIG_PCS_XF_RX_OVRD_IN_3;
        uint32_t RAWLANE3_DIG_PCS_XF_RX_OVRD_IN_2;
        uint32_t RAWLANE3_DIG_PCS_XF_RX_OVRD_IN_3;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        uint32_t TMDS_DCBALANCER_CONTROL;
        uint32_t PHYA_LINK_CNTL2;
        uint32_t PHYB_LINK_CNTL2;
        uint32_t PHYC_LINK_CNTL2;
-#endif
 };
 
 #define LE_SF(reg_name, field_name, post_fix)\
        type AUX_RX_TIMEOUT_LEN;\
        type AUX_RX_TIMEOUT_LEN_MUL
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
-
 #define DCN30_LINK_ENCODER_REG_FIELD_LIST(type) \
        type TMDS_SYNC_DCBAL_EN;\
        type PHY_HPO_DIG_SRC_SEL;\
        type DPCS_TX_DATA_SWAP_10_BIT;\
        type DPCS_TX_DATA_ORDER_INVERT_18_BIT;\
        type RDPCS_TX_CLK_EN
-#endif
 
 struct dcn10_link_enc_shift {
        DCN_LINK_ENCODER_REG_FIELD_LIST(uint8_t);
        DCN20_LINK_ENCODER_REG_FIELD_LIST(uint8_t);
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        DCN30_LINK_ENCODER_REG_FIELD_LIST(uint8_t);
-#endif
 };
 
 struct dcn10_link_enc_mask {
        DCN_LINK_ENCODER_REG_FIELD_LIST(uint32_t);
        DCN20_LINK_ENCODER_REG_FIELD_LIST(uint32_t);
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        DCN30_LINK_ENCODER_REG_FIELD_LIST(uint32_t);
-#endif
 };
 
 struct dcn10_link_encoder {
 
                REG_UPDATE(OPTC_DATA_FORMAT_CONTROL, OPTC_DATA_FORMAT, data_fmt);
        }
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        if (optc1->tg_mask->OTG_H_TIMING_DIV_MODE != 0) {
                if (optc1->opp_count == 4)
                        h_div = H_TIMING_DIV_BY4;
 
                REG_UPDATE(OTG_H_TIMING_CNTL,
                OTG_H_TIMING_DIV_MODE, h_div);
-       } else
-#endif
-       {
+       } else {
                REG_UPDATE(OTG_H_TIMING_CNTL,
                OTG_H_TIMING_DIV_BY2, h_div);
        }
 
        uint32_t OPTC_DATA_FORMAT_CONTROL;
        uint32_t OPTC_BYTES_PER_PIXEL;
        uint32_t OPTC_WIDTH_CONTROL;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        uint32_t OTG_BLANK_DATA_COLOR;
        uint32_t OTG_BLANK_DATA_COLOR_EXT;
        uint32_t OTG_DRR_TRIGGER_WINDOW;
        uint32_t OTG_M_CONST_DTO1;
        uint32_t OTG_DRR_V_TOTAL_CHANGE;
        uint32_t OTG_GLOBAL_CONTROL4;
-#endif
 };
 
 #define TG_COMMON_MASK_SH_LIST_DCN(mask_sh)\
        type MANUAL_FLOW_CONTROL;\
        type MANUAL_FLOW_CONTROL_SEL;
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
-
 #define TG_REG_FIELD_LIST(type) \
        TG_REG_FIELD_LIST_DCN1_0(type)\
        type OTG_V_SYNC_MODE;\
        type OTG_CRC_DATA_STREAM_COMBINE_MODE;\
        type OTG_CRC_DATA_STREAM_SPLIT_MODE;\
        type OTG_CRC_DATA_FORMAT;
-#else
-
-#define TG_REG_FIELD_LIST(type) \
-       TG_REG_FIELD_LIST_DCN1_0(type)\
-       type MASTER_UPDATE_LOCK_DB_X;\
-       type MASTER_UPDATE_LOCK_DB_Y;\
-       type MASTER_UPDATE_LOCK_DB_EN;\
-       type GLOBAL_UPDATE_LOCK_EN;\
-       type DIG_UPDATE_LOCATION;\
-       type OTG_DSC_START_POSITION_X;\
-       type OTG_DSC_START_POSITION_LINE_NUM;\
-       type OPTC_NUM_OF_INPUT_SEGMENT;\
-       type OPTC_SEG0_SRC_SEL;\
-       type OPTC_SEG1_SRC_SEL;\
-       type OPTC_MEM_SEL;\
-       type OPTC_DATA_FORMAT;\
-       type OPTC_DSC_MODE;\
-       type OPTC_DSC_BYTES_PER_PIXEL;\
-       type OPTC_DSC_SLICE_WIDTH;\
-       type OPTC_SEGMENT_WIDTH;\
-       type OPTC_DWB0_SOURCE_SELECT;\
-       type OPTC_DWB1_SOURCE_SELECT;\
-       type OTG_CRC_DSC_MODE;\
-       type OTG_CRC_DATA_STREAM_COMBINE_MODE;\
-       type OTG_CRC_DATA_STREAM_SPLIT_MODE;\
-       type OTG_CRC_DATA_FORMAT;
-#endif
 
 
 struct dcn_optc_shift {
 
        uint32_t DP_SEC_METADATA_TRANSMISSION;
        uint32_t HDMI_METADATA_PACKET_CONTROL;
        uint32_t DP_SEC_FRAMING4;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        uint32_t DP_GSP11_CNTL;
        uint32_t HDMI_GENERIC_PACKET_CONTROL6;
        uint32_t HDMI_GENERIC_PACKET_CONTROL7;
        uint32_t HDMI_GENERIC_PACKET_CONTROL8;
        uint32_t HDMI_GENERIC_PACKET_CONTROL9;
        uint32_t HDMI_GENERIC_PACKET_CONTROL10;
-#endif
        uint32_t DIG_CLOCK_PATTERN;
 };
 
        type DP_PIXEL_COMBINE;\
        type DP_SST_SDP_SPLITTING
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 #define SE_REG_FIELD_LIST_DCN3_0(type) \
        type HDMI_GENERIC8_CONT;\
        type HDMI_GENERIC8_SEND;\
        type DP_SEC_GSP11_PPS;\
        type DP_SEC_GSP11_ENABLE;\
        type DP_SEC_GSP11_LINE_NUM
-#endif
 
 struct dcn10_stream_encoder_shift {
        SE_REG_FIELD_LIST_DCN1_0(uint8_t);
        SE_REG_FIELD_LIST_DCN2_0(uint8_t);
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        SE_REG_FIELD_LIST_DCN3_0(uint8_t);
-#endif
 };
 
 struct dcn10_stream_encoder_mask {
        SE_REG_FIELD_LIST_DCN1_0(uint32_t);
        SE_REG_FIELD_LIST_DCN2_0(uint32_t);
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        SE_REG_FIELD_LIST_DCN3_0(uint32_t);
-#endif
 };
 
 struct dcn10_stream_encoder {
 
        type REFCLK_CLOCK_EN;\
        type REFCLK_SRC_SEL;
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 #define DCCG3_REG_FIELD_LIST(type) \
        type PHYASYMCLK_FORCE_EN;\
        type PHYASYMCLK_FORCE_SRC_SEL;\
        type PHYBSYMCLK_FORCE_SRC_SEL;\
        type PHYCSYMCLK_FORCE_EN;\
        type PHYCSYMCLK_FORCE_SRC_SEL;
-#endif
 
 struct dccg_shift {
        DCCG_REG_FIELD_LIST(uint8_t)
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        DCCG3_REG_FIELD_LIST(uint8_t)
-#endif
 };
 
 struct dccg_mask {
        DCCG_REG_FIELD_LIST(uint32_t)
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        DCCG3_REG_FIELD_LIST(uint32_t)
-#endif
 };
 
 struct dccg_registers {
        uint32_t DPPCLK_DTO_CTRL;
        uint32_t DPPCLK_DTO_PARAM[6];
        uint32_t REFCLK_CNTL;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        uint32_t HDMICHARCLK_CLOCK_CNTL[6];
        uint32_t PHYASYMCLK_CLOCK_CNTL;
        uint32_t PHYBSYMCLK_CLOCK_CNTL;
        uint32_t PHYCSYMCLK_CLOCK_CNTL;
-#endif
 };
 
 struct dcn_dccg {
 
        case SURFACE_PIXEL_FORMAT_GRPH_BGR101111_FIX:
        case SURFACE_PIXEL_FORMAT_GRPH_RGB111110_FLOAT:
        case SURFACE_PIXEL_FORMAT_GRPH_BGR101111_FLOAT:
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        case SURFACE_PIXEL_FORMAT_GRPH_RGBE:
        case SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA:
-#endif
                *bytes_per_element = 4;
                return true;
        case SURFACE_PIXEL_FORMAT_GRPH_ARGB16161616:
        case 65536:
                block_size = DCN_PAGE_TABLE_BLOCK_SIZE_64KB;
                break;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        case 32768:
                block_size = DCN_PAGE_TABLE_BLOCK_SIZE_32KB;
                break;
-#endif
        default:
                ASSERT(false);
                block_size = page_table_block_size;
 
         */
        use_pitch_c = format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN
                && format < SURFACE_PIXEL_FORMAT_SUBSAMPLE_END;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        use_pitch_c = use_pitch_c
                || (format == SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA);
-#endif
        if (use_pitch_c) {
                ASSERT(plane_size->chroma_pitch != 0);
                /* Chroma pitch zero can cause system hang! */
                        PITCH, pitch, META_PITCH, meta_pitch);
 
        use_pitch_c = format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        use_pitch_c = use_pitch_c
                || (format == SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA);
-#endif
        if (use_pitch_c)
                REG_UPDATE_2(DCSURF_SURFACE_PITCH_C,
                        PITCH_C, pitch_c, META_PITCH_C, meta_pitch_c);
                REG_UPDATE(DCSURF_SURFACE_CONFIG,
                                SURFACE_PIXEL_FORMAT, 119);
                break;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        case SURFACE_PIXEL_FORMAT_GRPH_RGBE:
                REG_UPDATE_2(DCSURF_SURFACE_CONFIG,
                                SURFACE_PIXEL_FORMAT, 116,
                                SURFACE_PIXEL_FORMAT, 116,
                                ALPHA_PLANE_EN, 1);
                break;
-#endif
        default:
                BREAK_TO_DEBUGGER();
                break;
 
        uint32_t VBLANK_PARAMETERS_5;\
        uint32_t VBLANK_PARAMETERS_6
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 #define DCN30_HUBP_REG_COMMON_VARIABLE_LIST \
        DCN21_HUBP_REG_COMMON_VARIABLE_LIST;\
        uint32_t DCN_DMDATA_VM_CNTL
-#endif
 
 #define DCN2_HUBP_REG_FIELD_VARIABLE_LIST(type) \
        DCN_HUBP_REG_FIELD_BASE_LIST(type); \
        type REFCYC_PER_META_CHUNK_FLIP_C; \
        type VM_GROUP_SIZE
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 #define DCN30_HUBP_REG_FIELD_VARIABLE_LIST(type) \
        DCN21_HUBP_REG_FIELD_VARIABLE_LIST(type);\
        type PRIMARY_SURFACE_DCC_IND_BLK;\
        type PACK_3TO2_ELEMENT_DISABLE; \
        type ROW_TTU_MODE; \
        type NUM_PKRS
-#endif
 
 struct dcn_hubp2_registers {
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        DCN30_HUBP_REG_COMMON_VARIABLE_LIST;
-#else
-       DCN21_HUBP_REG_COMMON_VARIABLE_LIST;
-#endif
 };
 
 struct dcn_hubp2_shift {
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        DCN30_HUBP_REG_FIELD_VARIABLE_LIST(uint8_t);
-#else
-       DCN21_HUBP_REG_FIELD_VARIABLE_LIST(uint8_t);
-#endif
-
 };
 
 struct dcn_hubp2_mask {
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        DCN30_HUBP_REG_FIELD_VARIABLE_LIST(uint32_t);
-#else
-       DCN21_HUBP_REG_FIELD_VARIABLE_LIST(uint32_t);
-#endif
-
 };
 
 struct dcn20_hubp {
 
                                        pipe_ctx->pipe_idx);
 }
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 static int calc_mpc_flow_ctrl_cnt(const struct dc_stream_state *stream,
                int opp_cnt)
 {
 
        return flow_ctrl_cnt;
 }
-#endif
 
 enum dc_status dcn20_enable_stream_timing(
                struct pipe_ctx *pipe_ctx,
        struct pipe_ctx *odm_pipe;
        int opp_cnt = 1;
        int opp_inst[MAX_PIPES] = { pipe_ctx->stream_res.opp->inst };
-
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        bool interlace = stream->timing.flags.INTERLACE;
        int i;
-
        struct mpc_dwb_flow_control flow_control;
        struct mpc *mpc = dc->res_pool->mpc;
        bool rate_control_2x_pclk = (interlace || optc2_is_two_pixels_per_containter(&stream->timing));
 
-#endif
        /* by upper caller loop, pipe0 is parent pipe and be called first.
         * back end is set up by for pipe0. Other children pipe share back end
         * with pipe 0. No program is needed.
                        pipe_ctx->stream->signal,
                        true);
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        rate_control_2x_pclk = rate_control_2x_pclk || opp_cnt > 1;
        flow_control.flow_ctrl_mode = 0;
        flow_control.flow_ctrl_cnt0 = 0x80;
                                        &flow_control);
                }
        }
-#endif
+
        for (odm_pipe = pipe_ctx->next_odm_pipe; odm_pipe; odm_pipe = odm_pipe->next_odm_pipe)
                odm_pipe->stream_res.opp->funcs->opp_pipe_clock_control(
                                odm_pipe->stream_res.opp,
        if (pipe_ctx->update_flags.bits.enable || pipe_ctx->update_flags.bits.opp_changed
                        || pipe_ctx->stream->update_flags.bits.gamut_remap
                        || pipe_ctx->stream->update_flags.bits.out_csc) {
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
                struct mpc *mpc = pipe_ctx->stream_res.opp->ctx->dc->res_pool->mpc;
 
                if (mpc->funcs->set_gamut_remap) {
                        }
                        mpc->funcs->set_gamut_remap(mpc, mpcc_id, &adjust);
                } else
-#endif
                        /* dpp/cm gamut remap*/
                        dc->hwss.program_gamut_remap(pipe_ctx);
 
        blnd_cfg.bottom_inside_gain = 0x1f000;
        blnd_cfg.bottom_outside_gain = 0x1f000;
        blnd_cfg.pre_multiplied_alpha = per_pixel_alpha;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        if (pipe_ctx->plane_state->format
                        == SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA)
                blnd_cfg.pre_multiplied_alpha = false;
-#endif
 
        /*
         * TODO: remove hack
 
        bool dp_tx1_vergdrv_byp;
        bool dp_tx2_vergdrv_byp;
        bool dp_tx3_vergdrv_byp;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        uint32_t tx_peaking_lvl;
        uint32_t ctr_reqs_pll;
-#endif
 
 
 };
 
                unsigned int v_total;
                unsigned int front_porch;
                int output_bpc;
-
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
                struct audio_check aud_check = {0};
-#endif
+
                if (!res_ctx->pipe_ctx[i].stream)
                        continue;
 
                case 1:
                        pipes[pipe_cnt].pipe.dest.odm_combine = dm_odm_combine_mode_2to1;
                        break;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
                case 3:
                        pipes[pipe_cnt].pipe.dest.odm_combine = dm_odm_combine_mode_4to1;
                        break;
-#endif
                default:
                        pipes[pipe_cnt].pipe.dest.odm_combine = dm_odm_combine_mode_disabled;
                }
 
                /* todo: default max for now, until there is logic reflecting this in dc*/
                pipes[pipe_cnt].dout.output_bpc = 12;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
                /*fill up the audio sample rate (unit in kHz)*/
                get_audio_check(&res_ctx->pipe_ctx[i].stream->audio_info, &aud_check);
                pipes[pipe_cnt].dout.max_audio_sample_rate = aud_check.max_audiosample_rate / 1000;
-#endif
                /*
                 * For graphic plane, cursor number is 1, nv12 is 0
                 * bw calculations due to cursor on/off
                        if (pipes[pipe_cnt].pipe.dest.odm_combine == dm_odm_combine_mode_2to1) {
                                pipes[pipe_cnt].pipe.src.viewport_width /= 2;
                                pipes[pipe_cnt].pipe.dest.recout_width /= 2;
-                       }
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
-                       else if (pipes[pipe_cnt].pipe.dest.odm_combine == dm_odm_combine_mode_4to1) {
+                       } else if (pipes[pipe_cnt].pipe.dest.odm_combine == dm_odm_combine_mode_4to1) {
                                pipes[pipe_cnt].pipe.src.viewport_width /= 4;
                                pipes[pipe_cnt].pipe.dest.recout_width /= 4;
                        }
-#endif
                } else {
                        struct dc_plane_state *pln = res_ctx->pipe_ctx[i].plane_state;
                        struct scaler_data *scl = &res_ctx->pipe_ctx[i].plane_res.scl_data;
                        pipes[pipe_cnt].pipe.src.surface_height_y = pln->plane_size.surface_size.height;
                        pipes[pipe_cnt].pipe.src.surface_width_c = pln->plane_size.chroma_size.width;
                        pipes[pipe_cnt].pipe.src.surface_height_c = pln->plane_size.chroma_size.height;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
                        if (pln->format == SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA
                                        || pln->format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN) {
-#else
-                       if (pln->format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN) {
-#endif
                                pipes[pipe_cnt].pipe.src.data_pitch = pln->plane_size.surface_pitch;
                                pipes[pipe_cnt].pipe.src.data_pitch_c = pln->plane_size.chroma_pitch;
                                pipes[pipe_cnt].pipe.src.meta_pitch = pln->dcc.meta_pitch;
                        pipes[pipe_cnt].pipe.dest.full_recout_width = scl->recout.width;
                        if (pipes[pipe_cnt].pipe.dest.odm_combine == dm_odm_combine_mode_2to1)
                                pipes[pipe_cnt].pipe.dest.full_recout_width *= 2;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
                        else if (pipes[pipe_cnt].pipe.dest.odm_combine == dm_odm_combine_mode_4to1)
                                pipes[pipe_cnt].pipe.dest.full_recout_width *= 4;
-#endif
                        else {
                                struct pipe_ctx *split_pipe = res_ctx->pipe_ctx[i].bottom_pipe;
 
                        case SURFACE_PIXEL_FORMAT_GRPH_PALETA_256_COLORS:
                                pipes[pipe_cnt].pipe.src.source_format = dm_444_8;
                                break;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
                        case SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA:
                                pipes[pipe_cnt].pipe.src.source_format = dm_rgbe_alpha;
                                break;
-#endif
                        default:
                                pipes[pipe_cnt].pipe.src.source_format = dm_444_32;
                                break;
                        split[i] = 2;
                        v->ODMCombineEnablePerState[vlevel][pipe_plane] = dm_odm_combine_mode_2to1;
                }
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
                if (dc->debug.force_odm_combine_4to1 & (1 << pipe->stream_res.tg->inst)) {
                        split[i] = 4;
                        v->ODMCombineEnablePerState[vlevel][pipe_plane] = dm_odm_combine_mode_4to1;
                                pipe->stream->timing.pixel_encoding == PIXEL_ENCODING_YCBCR420) {
                        split[i] = 4;
                }
-#endif
                v->ODMCombineEnabled[pipe_plane] =
                        v->ODMCombineEnablePerState[vlevel][pipe_plane];
 
 
        .dpp_program_degamma_pwl        = NULL,
        .dpp_program_cm_dealpha = dpp3_program_cm_dealpha,
        .dpp_program_cm_bias = dpp3_program_cm_bias,
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        .dpp_program_blnd_lut = dpp3_program_blnd_lut,
        .dpp_program_shaper_lut = dpp3_program_shaper,
        .dpp_program_3dlut = dpp3_program_3dlut,
-#else
-       .dpp_program_blnd_lut           = NULL,
-       .dpp_program_shaper_lut         = NULL,
-       .dpp_program_3dlut              = NULL,
-#endif
-
        .dpp_program_bias_and_scale     = NULL,
        .dpp_cnv_set_alpha_keyer        = dpp2_cnv_set_alpha_keyer,
        .set_cursor_attributes          = dpp3_set_cursor_attributes,
 
                const struct dcn_hubp2_shift *hubp_shift,
                const struct dcn_hubp2_mask *hubp_mask);
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
 void hubp3_set_vm_system_aperture_settings(struct hubp *hubp,
        struct vm_system_aperture_param *apt);
-#endif
 
 bool hubp3_program_surface_flip_and_addr(
        struct hubp *hubp,
 
 
 struct dp_mst_stream_allocation_table;
 
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
 /*
  * Allocate memory accessible by the GPU
  *
                enum dc_gpu_mem_alloc_type type,
                void *pvMem);
 
-#endif
 enum dc_edid_status dm_helpers_parse_edid_caps(
        struct dc_context *ctx,
        const struct dc_edid *edid,
 
        enum pp_smu_status (*get_dpm_clock_table) (struct pp_smu *pp,
                        struct dpm_clocks *clock_table);
 };
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
+
 struct pp_smu_funcs_vgh {
        struct pp_smu pp_smu;
 
 
        enum pp_smu_status (*notify_smu_timeout) (struct pp_smu *pp);
 };
-#endif
+
 struct pp_smu_funcs {
        struct pp_smu ctx;
        union {
                struct pp_smu_funcs_rv rv_funcs;
                struct pp_smu_funcs_nv nv_funcs;
                struct pp_smu_funcs_rn rn_funcs;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
                struct pp_smu_funcs_vgh vgh_funcs;
-#endif
        };
 };
 
 
 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20v2.o := $(dml_rcflags)
 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn21/display_mode_vba_21.o := $(dml_rcflags)
 CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn21/display_rq_dlg_calc_21.o := $(dml_rcflags)
-endif
-ifdef CONFIG_DRM_AMD_DC_DCN3_0
 CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_mode_vba_30.o := $(dml_ccflags) -Wframe-larger-than=2048
 CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_rq_dlg_calc_30.o := $(dml_ccflags)
 endif
 DML += display_mode_vba.o dcn20/display_rq_dlg_calc_20.o dcn20/display_mode_vba_20.o
 DML += dcn20/display_rq_dlg_calc_20v2.o dcn20/display_mode_vba_20v2.o
 DML += dcn21/display_rq_dlg_calc_21.o dcn21/display_mode_vba_21.o
-endif
-
-ifdef CONFIG_DRM_AMD_DC_DCN3_0
 DML += dcn30/display_mode_vba_30.o dcn30/display_rq_dlg_calc_30.o
 endif
 
 
  *
  */
 
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
+#ifdef CONFIG_DRM_AMD_DC_DCN
 #include "dc.h"
 #include "dc_link.h"
 #include "../display_mode_lib.h"
        }
 }
 
-#endif /* CONFIG_DRM_AMD_DC_DCN3_0 */
+#endif /* CONFIG_DRM_AMD_DC_DCN */
 
  *
  */
 
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
+#ifdef CONFIG_DRM_AMD_DC_DCN
 
 #include "../display_mode_lib.h"
 #include "../display_mode_vba.h"
 
 #include "dcn20/display_rq_dlg_calc_20v2.h"
 #include "dcn21/display_mode_vba_21.h"
 #include "dcn21/display_rq_dlg_calc_21.h"
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
 #include "dcn30/display_mode_vba_30.h"
 #include "dcn30/display_rq_dlg_calc_30.h"
 #include "dml_logger.h"
-#endif
 
 const struct dml_funcs dml20_funcs = {
        .validate = dml20_ModeSupportAndSystemConfigurationFull,
         .rq_dlg_get_rq_reg = dml21_rq_dlg_get_rq_reg
 };
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 const struct dml_funcs dml30_funcs = {
        .validate = dml30_ModeSupportAndSystemConfigurationFull,
        .recalculate = dml30_recalculate,
        .rq_dlg_get_dlg_reg = dml30_rq_dlg_get_dlg_reg,
        .rq_dlg_get_rq_reg = dml30_rq_dlg_get_rq_reg
 };
-#endif
+
 void dml_init_instance(struct display_mode_lib *lib,
                const struct _vcs_dpi_soc_bounding_box_st *soc_bb,
                const struct _vcs_dpi_ip_params_st *ip_params,
         case DML_PROJECT_DCN21:
                 lib->funcs = dml21_funcs;
                 break;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        case DML_PROJECT_DCN30:
                lib->funcs = dml30_funcs;
                break;
-#endif
 
        default:
                break;
        default:                                  return "Unknown Status";
        }
 }
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+
 void dml_log_pipe_params(
                struct display_mode_lib *mode_lib,
                display_e2e_pipe_params_st *pipes,
                dml_print("DML SUPPORT:     ImmediateFlipSupportedForState      : [%d, %d]\n", mode_lib->vba.ImmediateFlipSupportedForState[i][0], mode_lib->vba.ImmediateFlipSupportedForState[i][1]);
        }
 }
-#endif
 
        DML_PROJECT_NAVI10,
        DML_PROJECT_NAVI10v2,
        DML_PROJECT_DCN21,
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
        DML_PROJECT_DCN30,
-#endif
 };
 
 struct display_mode_lib;
 
 const char *dml_get_status_message(enum dm_validation_status status);
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 void dml_log_pipe_params(
                struct display_mode_lib *mode_lib,
                display_e2e_pipe_params_st *pipes,
                int pipe_cnt);
 
 void dml_log_mode_support_params(struct display_mode_lib *mode_lib);
-#endif  // CONFIG_DRM_AMD_DC_DCN3_0
 #endif
 
 
 struct _vcs_dpi_ip_params_st {
        bool use_min_dcfclk;
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
        bool clamp_min_dcfclk;
-#endif
        bool gpuvm_enable;
        bool hostvm_enable;
        bool dsc422_native_support;
 
 
        // IP Parameters
        mode_lib->vba.UseMinimumRequiredDCFCLK = ip->use_min_dcfclk;
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
        mode_lib->vba.ClampMinDCFCLK = ip->clamp_min_dcfclk;
-#endif
        mode_lib->vba.MaxNumDPP = ip->max_num_dpp;
        mode_lib->vba.MaxNumOTG = ip->max_num_otg;
        mode_lib->vba.MaxNumHDMIFRLOutputs = ip->max_num_hdmi_frl_outputs;
 
        double BPP;
        enum odm_combine_policy ODMCombinePolicy;
        bool UseMinimumRequiredDCFCLK;
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
        bool ClampMinDCFCLK;
-#endif
        bool AllowDramClockChangeOneDisplayVactive;
        bool SynchronizeTimingsIfSingleRefreshRate;
 
 
 ###############################################################################
 # all DCE8.x are derived from DCE8.0
 GPIO_DCE80 = hw_translate_dce80.o hw_factory_dce80.o
-       
+
 AMD_DAL_GPIO_DCE80 = $(addprefix $(AMDDALPATH)/dc/gpio/dce80/,$(GPIO_DCE80))
 
 AMD_DISPLAY_FILES += $(AMD_DAL_GPIO_DCE80)
 AMD_DAL_GPIO_DCN21 = $(addprefix $(AMDDALPATH)/dc/gpio/dcn21/,$(GPIO_DCN21))
 
 AMD_DISPLAY_FILES += $(AMD_DAL_GPIO_DCN21)
-endif
+
 ###############################################################################
 # DCN 3
 ###############################################################################
-ifdef CONFIG_DRM_AMD_DC_DCN3_0
 GPIO_DCN30 = hw_translate_dcn30.o hw_factory_dcn30.o
 
 AMD_DAL_GPIO_DCN30 = $(addprefix $(AMDDALPATH)/dc/gpio/dcn30/,$(GPIO_DCN30))
 
  * Authors: AMD
  *
  */
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 #include "dm_services.h"
 #include "include/gpio_types.h"
 #include "../hw_factory.h"
 
  * Authors: AMD
  *
  */
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 #ifndef __DAL_HW_FACTORY_DCN30_H__
 #define __DAL_HW_FACTORY_DCN30_H__
 
 
 /*
  * Pre-requisites: headers required by header of this unit
  */
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 #include "hw_translate_dcn30.h"
 
 #include "dm_services.h"
 
  * Authors: AMD
  *
  */
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 #ifndef __DAL_HW_TRANSLATE_DCN30_H__
 #define __DAL_HW_TRANSLATE_DCN30_H__
 
 
 #include "dcn10/hw_factory_dcn10.h"
 #include "dcn20/hw_factory_dcn20.h"
 #include "dcn21/hw_factory_dcn21.h"
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 #include "dcn30/hw_factory_dcn30.h"
 #endif
 
        case DCN_VERSION_1_01:
                dal_hw_factory_dcn10_init(factory);
                return true;
-
        case DCN_VERSION_2_0:
                dal_hw_factory_dcn20_init(factory);
                return true;
        case DCN_VERSION_2_1:
                dal_hw_factory_dcn21_init(factory);
                return true;
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        case DCN_VERSION_3_0:
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
        case DCN_VERSION_3_01:
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
        case DCN_VERSION_3_02:
-#endif
                dal_hw_factory_dcn30_init(factory);
                return true;
 #endif
 
 #include "dcn10/hw_translate_dcn10.h"
 #include "dcn20/hw_translate_dcn20.h"
 #include "dcn21/hw_translate_dcn21.h"
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 #include "dcn30/hw_translate_dcn30.h"
 #endif
 
        case DCN_VERSION_1_01:
                dal_hw_translate_dcn10_init(translate);
                return true;
-
        case DCN_VERSION_2_0:
                dal_hw_translate_dcn20_init(translate);
                return true;
        case DCN_VERSION_2_1:
                dal_hw_translate_dcn21_init(translate);
                return true;
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        case DCN_VERSION_3_0:
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
        case DCN_VERSION_3_01:
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
        case DCN_VERSION_3_02:
-#endif
                dal_hw_translate_dcn30_init(translate);
                return true;
 #endif
 
        void (*update_bw_bounding_box)(
                        struct dc *dc,
                        struct clk_bw_params *bw_params);
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        bool (*acquire_post_bldn_3dlut)(
                        struct resource_context *res_ctx,
                        const struct resource_pool *pool,
        unsigned int underlay_pipe_index;
        unsigned int stream_enc_count;
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        struct dc_3dlut *mpc_lut[MAX_PIPES];
        struct dc_transfer_func *mpc_shaper[MAX_PIPES];
 #endif
        struct dmcu *dmcu;
        struct dmub_psr *psr;
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        struct abm *multiple_abms[MAX_PIPES];
 #endif
 
        uint8_t clock_source_ref_count[MAX_CLOCK_SOURCES];
        uint8_t dp_clock_source_ref_count;
        bool is_dsc_acquired[MAX_PIPES];
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        bool is_mpc_3dlut_acquired[MAX_PIPES];
 #endif
 };
 
 #define DCN_MINIMUM_DISPCLK_Khz 100000
 #define DCN_MINIMUM_DPPCLK_Khz 100000
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 struct dcn3_clk_internal {
        int dummy;
        /*TODO:
        */
 };
 
-#endif
-
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
 struct dcn301_clk_internal {
        int dummy;
        uint32_t CLK1_CLK0_CURRENT_CNT; //dispclk
        uint32_t CLK1_CLK3_BYPASS_CNTL; //dcfclk bypass
 };
 
-#endif
-
 /* Will these bw structures be ASIC specific? */
 
 #define MAX_NUM_DPM_LVL                8
        unsigned int fclk_mhz;
        unsigned int memclk_mhz;
        unsigned int socclk_mhz;
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
        unsigned int dtbclk_mhz;
        unsigned int dispclk_mhz;
        unsigned int dppclk_mhz;
        unsigned int phyclk_mhz;
-#endif
 };
 
 /* This table is contiguous */
        bool valid;
 };
 
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
-
 struct nv_wm_range_entry {
        bool valid;
 
                double sr_enter_plus_exit_time_us;
        } dml_input;
 };
-#endif
 
 struct clk_log_info {
        bool enabled;
  * D occupied, C will be emptry.
  */
 struct wm_table {
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
        union {
                struct nv_wm_range_entry nv_entries[WM_SET_COUNT];
-#endif
-       struct wm_range_table_entry entries[WM_SET_COUNT];
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
+               struct wm_range_table_entry entries[WM_SET_COUNT];
        };
-#endif
 };
 
 struct dummy_pstate_entry {
 
        /* Notify clk_mgr of a change in link rate, update phyclk frequency if necessary */
        void (*notify_link_rate_change)(struct clk_mgr *clk_mgr, struct dc_link *link);
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
        /*
         * Send message to PMFW to set hard min memclk frequency
         * When current_mode = false, set DPM0
 
        /* Get current memclk states from PMFW, update relevant structures */
        void (*get_memclk_states_from_smu)(struct clk_mgr *clk_mgr);
-#endif
 };
 
-#ifdef CONFIG_DRM_AMD_DC_DCN3_01
 struct dpm_clocks;
 struct wartermarks;
 
        union large_integer mc_address;
 };
 
-#endif
-
 struct clk_mgr {
        struct dc_context *ctx;
        struct clk_mgr_funcs *funcs;
        struct dc_clocks clks;
        bool psr_allow_active_cache;
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
        bool force_smu_not_present;
-#endif
        int dprefclk_khz; // Used by program pixel clock in clock source funcs, need to figureout where this goes
        int dentist_vco_freq_khz;
        struct clk_state_registers_and_bypass boot_snapshot;
        struct clk_bw_params *bw_params;
        struct pp_smu_wm_range_sets ranges;
-#ifdef CONFIG_DRM_AMD_DC_DCN3_01
        struct smu_watermark_set smu_wm_set;
-#endif
 };
 
 /* forward declarations */
 
        CLK_SRI(CLK3_CLK_PLL_REQ, CLK3, 0), \
        CLK_SRI(CLK3_CLK2_DFS_CNTL, CLK3, 0)
 
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
 // TODO:
 #define CLK_REG_LIST_DCN3()      \
        SR(DENTIST_DISPCLK_CNTL)
-#endif
 
 #define CLK_SF(reg_name, field_name, post_fix)\
        .field_name = reg_name ## __ ## field_name ## post_fix
        uint32_t CLK3_CLK2_DFS_CNTL;
        uint32_t CLK3_CLK_PLL_REQ;
 
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
        uint32_t CLK0_CLK2_DFS_CNTL;
        uint32_t CLK0_CLK_PLL_REQ;
-#endif
+
        uint32_t MP1_SMN_C2PMSG_67;
        uint32_t MP1_SMN_C2PMSG_83;
        uint32_t MP1_SMN_C2PMSG_91;
        bool periodic_retraining_disabled;
 
        unsigned int cur_phyclk_req_table[MAX_PIPES * 2];
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
 
        bool smu_present;
        void *wm_range_table;
        long long wm_range_table_addr;
-#endif
 };
 
 struct clk_mgr_internal_funcs {
 
        dcc_control__256_256_xxx,
        dcc_control__128_128_xxx,
        dcc_control__256_64_64,
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        dcc_control__256_128_128,
-#endif
 };
 
 enum segment_order {
 enum dcn_hubbub_page_table_block_size {
        DCN_PAGE_TABLE_BLOCK_SIZE_4KB = 0,
        DCN_PAGE_TABLE_BLOCK_SIZE_64KB = 4,
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        DCN_PAGE_TABLE_BLOCK_SIZE_32KB = 3
-#endif
 };
 
 struct dcn_hubbub_phys_addr_config {
        void (*apply_DEDCN21_147_wa)(struct hubbub *hubbub);
 
        void (*force_wm_propagate_to_pipes)(struct hubbub *hubbub);
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 
        void (*force_pstate_change_control)(struct hubbub *hubbub, bool force, bool allow);
 
        void (*init_watermarks)(struct hubbub *hubbub);
-#endif
 };
 
 struct hubbub {
 
 };
 
 struct dpp_funcs {
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        bool (*dpp_program_gamcor_lut)(
                struct dpp *dpp_base, const struct pwl_params *params);
 
        void (*dpp_set_pre_degam)(struct dpp *dpp_base,
                        enum dc_transfer_func_predefined tr);
-#endif
 
        void (*dpp_program_cm_dealpha)(struct dpp *dpp_base,
                uint32_t enable, uint32_t additive_blending);
 
 };
 
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 enum dwb_boundary_mode {
        DWBSCL_BOUNDARY_MODE_EDGE  = 0,
        DWBSCL_BOUNDARY_MODE_BLACK = 1
 };
 #endif
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 enum dwb_output_csc_mode {
        DWB_OUTPUT_CSC_DISABLE = 0,
        DWB_OUTPUT_CSC_COEF_A = 1,
                struct dwb_warmup_params *warmup_params);
 
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 
        void (*dwb_program_output_csc)(
                struct dwbc *dwbc,
 
 enum hubp_ind_block_size {
        hubp_ind_block_unconstrained = 0,
        hubp_ind_block_64b,
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        hubp_ind_block_128b,
        hubp_ind_block_64b_no_128bcl,
-#endif
 };
 
 struct hubp {
                        struct _vcs_dpi_display_rq_regs_st *dml_rq_regs,
                        struct _vcs_dpi_display_dlg_regs_st *dml_dlg_attr,
                        struct _vcs_dpi_display_ttu_regs_st *dml_ttu_attr);
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
        void (*set_unbounded_requesting)(
                struct hubp *hubp,
                bool enable);
-#endif
 
 };
 
 
        IPP_DEGAMMA_MODE_USER_PWL
 };
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 enum gamcor_mode {
        GAMCOR_MODE_BYPASS,
        GAMCOR_MODE_RESERVED_1,
        GAMCOR_MODE_USER_PWL,
        GAMCOR_MODE_RESERVED_3
 };
-#endif
 
 enum ipp_output_format {
        IPP_OUTPUT_FORMAT_12_BIT_FIX,
 
        unsigned int            arbitration_slice;
        unsigned int            slice_lines;
        unsigned int            max_scaled_time;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        unsigned int            dram_speed_change_duration;
-#endif
 };
 
 struct mcif_irq_params {
 
 struct mcif_wb_funcs {
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        void (*warmup_mcif)(
                struct mcif_wb *mcif_wb,
                struct mcif_warmup_params *params);
-#endif
        void (*enable_mcif)(struct mcif_wb *mcif_wb);
 
        void (*disable_mcif)(struct mcif_wb *mcif_wb);
 
 #define MAX_MPCC 6
 #define MAX_OPP 6
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 #define MAX_DWB                2
-#else
-#define MAX_DWB                1
-#endif
 
 enum mpc_output_csc_mode {
        MPC_OUTPUT_CSC_DISABLE = 0,
        int bottom_outside_gain;
 };
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 struct mpc_grph_gamut_adjustment {
        struct fixed31_32 temperature_matrix[CSC_TEMPERATURE_MATRIX_SIZE];
        enum graphics_gamut_adjust_type gamut_adjust_type;
 };
-#endif
+
 struct mpcc_sm_cfg {
        bool enable;
        /* 0-single plane,2-row subsampling,4-column subsampling,6-checkboard subsampling */
        int clamp_min_b_cb;
 };
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 struct mpc_dwb_flow_control {
        int flow_ctrl_mode;
        int flow_ctrl_cnt0;
        int flow_ctrl_cnt1;
 };
-#endif
+
 /*
  * MPCC connection and blending configuration for a single MPCC instance.
  * This struct is used as a node in an MPC tree.
        struct mpcc *mpcc_bot;          /* pointer to bottom layer MPCC.  NULL when not connected */
        struct mpcc_blnd_cfg blnd_cfg;  /* The blending configuration for this MPCC */
        struct mpcc_sm_cfg sm_cfg;      /* stereo mix setting for this MPCC */
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        bool shared_bottom;             /* TRUE if MPCC output to both OPP and DWB endpoints, else FALSE */
-#endif
 };
 
 /*
                        int opp_id,
                        bool lock);
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        /*
         * Add DPP into 'secondary' MPC tree based on specified blending position.
         * Only used for planes that are part of blending chain for DWB output
        struct mpcc* (*get_mpcc_for_dpp_from_secondary)(
                        struct mpc_tree *tree,
                        int dpp_id);
-#endif
        struct mpcc* (*get_mpcc_for_dpp)(
                        struct mpc_tree *tree,
                        int dpp_id);
                        struct mpc *mpc,
                        int mpcc_id,
                        bool power_on);
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        void (*set_dwb_mux)(
                        struct mpc *mpc,
                        int dwb_id,
                bool enable,
                bool rate_2x_mode,
                struct mpc_dwb_flow_control *flow_control);
-#endif
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        void (*set_gamut_remap)(
                        struct mpc *mpc,
                        int mpcc_id,
 
        int (*release_rmu)(struct mpc *mpc, int mpcc_id);
 
-#endif
-
 };
 
 #endif
 
        struct dc_bios *bp;
        enum engine_id id;
        uint32_t stream_enc_inst;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        struct vpg *vpg;
        struct afmt *afmt;
-#endif
 };
 
 struct enc_state {
 
        INTERSECT_WINDOW_NOT_A_NOT_B,
 };
 
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
 enum otg_out_mux_dest {
        OUT_MUX_DIO = 0,
 };
-#endif
 
 enum h_timing_div_mode {
        H_TIMING_NO_DIV,
        H_TIMING_DIV_BY2,
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        H_TIMING_RESERVED,
        H_TIMING_DIV_BY4,
-#endif
 };
 
 struct crc_params {
        void (*set_gsl_source_select)(struct timing_generator *optc,
                        int group_idx,
                        uint32_t gsl_ready_signal);
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        void (*set_out_mux)(struct timing_generator *tg, enum otg_out_mux_dest dest);
        void (*set_vrr_m_const)(struct timing_generator *optc,
                        double vtotal_avg);
                        uint32_t window_start, uint32_t window_end);
        void (*set_vtotal_change_limit)(struct timing_generator *optc,
                        uint32_t limit);
-#endif
 };
 
 #endif
 
 struct dce_hwseq;
 
 struct hw_sequencer_funcs {
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
        void (*hardware_release)(struct dc *dc);
-#endif
        /* Embedded Display Related */
        void (*edp_power_control)(struct dc_link *link, bool enable);
        void (*edp_wait_for_hpd_ready)(struct dc_link *link, bool power_up);
 
        void (*set_pipe)(struct pipe_ctx *pipe_ctx);
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        /* Idle Optimization Related */
        bool (*apply_idle_power_optimizations)(struct dc *dc, bool enable);
-#endif
 
        bool (*is_abm_supported)(struct dc *dc,
                        struct dc_state *context, struct dc_stream_state *stream);
 
        int num_ddc;
        int num_vmid;
        int num_dsc;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        int num_mpc_3dlut;
-#endif
 };
 
 struct resource_straps {
 
 AMD_DAL_IRQ_DCN21= $(addprefix $(AMDDALPATH)/dc/irq/dcn21/,$(IRQ_DCN21))
 
 AMD_DISPLAY_FILES += $(AMD_DAL_IRQ_DCN21)
-endif
 ###############################################################################
 # DCN 30
 ###############################################################################
-ifdef CONFIG_DRM_AMD_DC_DCN3_0
 IRQ_DCN3 = irq_service_dcn30.o
 
 AMD_DAL_IRQ_DCN3 = $(addprefix $(AMDDALPATH)/dc/irq/dcn30/,$(IRQ_DCN3))
 
 AMD_DISPLAY_FILES += $(AMD_DAL_IRQ_DCN3)
-endif
-ifdef CONFIG_DRM_AMD_DC_DCN3_02
 ###############################################################################
 # DCN 3_02
 ###############################################################################
 
  *
  */
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 
 #include "dm_services.h"
 
 
  *
  */
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 
 #ifndef __DAL_IRQ_SERVICE_DCN30_H__
 #define __DAL_IRQ_SERVICE_DCN30_H__
 
        DMUB_ASIC_NONE = 0,
        DMUB_ASIC_DCN20,
        DMUB_ASIC_DCN21,
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
        DMUB_ASIC_DCN30,
-#endif
-#ifdef CONFIG_DRM_AMD_DC_DCN3_01
        DMUB_ASIC_DCN301,
-#endif
-#ifdef CONFIG_DRM_AMD_DC_DCN3_02
        DMUB_ASIC_DCN302,
-#endif
        DMUB_ASIC_MAX,
 };
 
 
 #
 
 DMUB = dmub_srv.o dmub_reg.o dmub_dcn20.o dmub_dcn21.o
-ifdef CONFIG_DRM_AMD_DC_DCN3_0
 DMUB += dmub_dcn30.o dmub_dcn301.o
-endif
-ifdef CONFIG_DRM_AMD_DC_DCN3_02
 DMUB += dmub_dcn302.o
-endif
 
 AMD_DAL_DMUB = $(addprefix $(AMDDALPATH)/dmub/src/,$(DMUB))
 
 
 #include "dmub_dcn20.h"
 #include "dmub_dcn21.h"
 #include "dmub_cmd.h"
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
 #include "dmub_dcn30.h"
-#endif
-#ifdef CONFIG_DRM_AMD_DC_DCN3_01
 #include "dmub_dcn301.h"
-#endif
-#ifdef CONFIG_DRM_AMD_DC_DCN3_02
 #include "dmub_dcn302.h"
-#endif
 #include "os_types.h"
 /*
  * Note: the DMUB service is standalone. No additional headers should be
        switch (asic) {
        case DMUB_ASIC_DCN20:
        case DMUB_ASIC_DCN21:
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
        case DMUB_ASIC_DCN30:
-#endif
-#ifdef CONFIG_DRM_AMD_DC_DCN3_01
        case DMUB_ASIC_DCN301:
-#endif
-#ifdef CONFIG_DRM_AMD_DC_DCN3_02
        case DMUB_ASIC_DCN302:
-#endif
                dmub->regs = &dmub_srv_dcn20_regs;
 
                funcs->reset = dmub_dcn20_reset;
                        funcs->is_auto_load_done = dmub_dcn21_is_auto_load_done;
                        funcs->is_phy_init = dmub_dcn21_is_phy_init;
                }
-#ifdef CONFIG_DRM_AMD_DC_DCN3_0
                if (asic == DMUB_ASIC_DCN30) {
                        dmub->regs = &dmub_srv_dcn30_regs;
 
                        funcs->backdoor_load = dmub_dcn30_backdoor_load;
                        funcs->setup_windows = dmub_dcn30_setup_windows;
                }
-#endif
-#ifdef CONFIG_DRM_AMD_DC_DCN3_01
                if (asic == DMUB_ASIC_DCN301) {
                        dmub->regs = &dmub_srv_dcn301_regs;
 
                        funcs->backdoor_load = dmub_dcn30_backdoor_load;
                        funcs->setup_windows = dmub_dcn30_setup_windows;
                }
-#endif
-#ifdef CONFIG_DRM_AMD_DC_DCN3_02
                if (asic == DMUB_ASIC_DCN302) {
                        dmub->regs = &dmub_srv_dcn302_regs;
 
                        funcs->backdoor_load = dmub_dcn30_backdoor_load;
                        funcs->setup_windows = dmub_dcn30_setup_windows;
                }
-#endif
                break;
 
        default:
 
 #define ASICREV_IS_NAVI12_P(eChipRev)        ((eChipRev >= NV_NAVI12_P_A0) && (eChipRev < NV_NAVI14_M_A0))
 #define ASICREV_IS_NAVI14_M(eChipRev)        ((eChipRev >= NV_NAVI14_M_A0) && (eChipRev < NV_UNKNOWN))
 #define ASICREV_IS_RENOIR(eChipRev) ((eChipRev >= RENOIR_A0) && (eChipRev < RAVEN1_F0))
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
 #define ASICREV_IS_SIENNA_CICHLID_P(eChipRev)        ((eChipRev >= NV_SIENNA_CICHLID_P_A0) && (eChipRev < NV_DIMGREY_CAVEFISH_P_A0))
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
 #define ASICREV_IS_DIMGREY_CAVEFISH_P(eChipRev)        ((eChipRev >= NV_DIMGREY_CAVEFISH_P_A0) && (eChipRev < NV_UNKNOWN))
-#endif
 #define GREEN_SARDINE_A0 0xA1
 #ifndef ASICREV_IS_GREEN_SARDINE
 #define ASICREV_IS_GREEN_SARDINE(eChipRev) ((eChipRev >= GREEN_SARDINE_A0) && (eChipRev < 0xFF))
 #endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
 #define FAMILY_VGH 144
 #define DEVICE_ID_VGH_163F 0x163F
 #define VANGOGH_A0 0x01
 #ifndef ASICREV_IS_VANGOGH
 #define ASICREV_IS_VANGOGH(eChipRev) ((eChipRev >= VANGOGH_A0) && (eChipRev < VANGOGH_UNKNOWN))
 #endif
-#endif
 
 /*
  * ASIC chip ID
 
        DCN_VERSION_1_01,
        DCN_VERSION_2_0,
        DCN_VERSION_2_1,
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
        DCN_VERSION_3_0,
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
        DCN_VERSION_3_01,
-#endif
-#if defined(CONFIG_DRM_AMD_DC_DCN3_02)
        DCN_VERSION_3_02,
-#endif
        DCN_VERSION_MAX
 };
 
 
        struct i2c_reg_info      reg_settings_6g[3];
 };
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
 struct edp_info {
        uint16_t edp_backlight_pwm_hz;
        uint16_t edp_ss_percentage;
        uint8_t  edp_panel_bpc;
        uint8_t  edp_bootup_bl_level;
 };
-#endif
 
 /* V6 */
 struct integrated_info {
        struct i2c_reg_info dp3_ext_hdmi_6g_reg_settings[3];
        /* V11 */
        uint32_t dp_ss_control;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_01)
        /* V2.1 */
        struct edp_info edp1_info;
        struct edp_info edp2_info;
-#endif
 };
 
 /**
 
        bool result = false;
        uint32_t i, j = 0;
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
        if (res_pool->abm == NULL && res_pool->multiple_abms[0] == NULL)
                return false;
 #else
 
        config.min_abm_backlight = ram_table.min_abm_backlight;
 
-#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
-       if (res_pool->multiple_abms[0]) {
+#if defined(CONFIG_DRM_AMD_DC_DCN)
+       if (res_pool->multiple_abms[0])
                result = res_pool->multiple_abms[0]->funcs->init_abm_config(
                        res_pool->multiple_abms[0], (char *)(&config), sizeof(struct abm_config_table));
-       } else
+       else
 #endif
                result = res_pool->abm->funcs->init_abm_config(
                        res_pool->abm, (char *)(&config), sizeof(struct abm_config_table));