drm/amd/display: Remove DCE12 guards

Signed-off-by: Jordan Lazare <Jordan.Lazare@amd.com>
Reviewed-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 96955c9b4cdf834e63b3ea470d84a5cd5656b07d..df95dd8439b6c8441b197e619fa2a16b2ace0262 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1987,9 +1987,7 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type)
        case CHIP_POLARIS12:
        case CHIP_TONGA:
        case CHIP_FIJI:
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        case CHIP_VEGA10:
-#endif
 #if defined(CONFIG_DRM_AMD_DC_PRE_VEGA)
                return amdgpu_dc != 0;
 #else

diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig
index 32826a0eafe79902051d3d3f18b7fdb7b3030fa0..47c8e2940a916b26b1c0ca1703253d2e49c6568c 100644 (file)
--- a/drivers/gpu/drm/amd/display/Kconfig
+++ b/drivers/gpu/drm/amd/display/Kconfig
@@ -17,13 +17,6 @@ config DRM_AMD_DC_PRE_VEGA
          by default. This includes Polaris, Carrizo, Tonga, Bonaire,
          and Hawaii.
 
-config DRM_AMD_DC_DCE12_0
-        bool "Vega10 family"
-        depends on DRM_AMD_DC
-        help
-         Choose this option if you want to have
-         VG family for display engine.
-
 config DEBUG_KERNEL_DC
        bool "Enable kgdb break in DC"
        depends on DRM_AMD_DC

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 9157772a0af36fbe5b16aaef643e6c6e69c8d49c..97d949affcfb6acedbea65411947d7cdef83a81c 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1123,9 +1123,7 @@ int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
        case CHIP_POLARIS11:
        case CHIP_POLARIS10:
        case CHIP_POLARIS12:
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        case CHIP_VEGA10:
-#endif
                if (dce110_register_irq_handlers(dm->adev)) {
                        DRM_ERROR("DM: Failed to initialize IRQ\n");
                        return -1;
@@ -1392,13 +1390,11 @@ static int dm_early_init(void *handle)
                adev->mode_info.num_hpd = 6;
                adev->mode_info.num_dig = 6;
                break;
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        case CHIP_VEGA10:
                adev->mode_info.num_crtc = 6;
                adev->mode_info.num_hpd = 6;
                adev->mode_info.num_dig = 6;
                break;
-#endif
        default:
                DRM_ERROR("Usupported ASIC type: 0x%X\n", adev->asic_type);
                return -EINVAL;

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
index df53092abc3982166b751e09683258056e8d4681..a8a53b85905a151f91f37f4f39f33d57277dc236 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
@@ -402,7 +402,6 @@ bool dm_pp_notify_wm_clock_changes(
        return false;
 }
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 bool dm_pp_notify_wm_clock_changes_soc15(
        const struct dc_context *ctx,
        struct dm_pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges)
@@ -410,7 +409,6 @@ bool dm_pp_notify_wm_clock_changes_soc15(
        /* TODO: to be implemented */
        return false;
 }
-#endif
 
 bool dm_pp_apply_power_level_change_request(
        const struct dc_context *ctx,

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
index 01aaf968854d11d7734c7b089b7c78328d880436..1c1c643439b8566dde87a982c41980e2437e4537 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
@@ -523,7 +523,6 @@ static void fill_plane_attributes_from_fb(
        surface->tiling_info.gfx8.pipe_config =
                        AMDGPU_TILING_GET(tiling_flags, PIPE_CONFIG);
 
-#if defined (CONFIG_DRM_AMD_DC_DCE12_0)
        if (adev->asic_type == CHIP_VEGA10) {
                /* Fill GFX9 params */
                surface->tiling_info.gfx9.num_pipes =
@@ -540,7 +539,6 @@ static void fill_plane_attributes_from_fb(
                        AMDGPU_TILING_GET(tiling_flags, SWIZZLE_MODE);
                surface->tiling_info.gfx9.shaderEnable = 1;
        }
-#endif
 
 
        surface->plane_size.grph.surface_size.x = 0;

diff --git a/drivers/gpu/drm/amd/display/dc/Makefile b/drivers/gpu/drm/amd/display/dc/Makefile
index a580cab6bf56ca4d30b5a7b8a6eae006400af31c..1a79762425ea74a253e7b40b25609c073dd443d0 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/Makefile
@@ -4,10 +4,7 @@
 
 DC_LIBS = basics bios calcs dce gpio i2caux irq virtual
 
-ifdef CONFIG_DRM_AMD_DC_DCE12_0
 DC_LIBS += dce120
-endif
-
 DC_LIBS += dce112
 DC_LIBS += dce110
 DC_LIBS += dce100

diff --git a/drivers/gpu/drm/amd/display/dc/bios/Makefile b/drivers/gpu/drm/amd/display/dc/bios/Makefile
index 770248429a817b741f257456f498e4c171617e15..a26cc605462db74dd61c79d545b4536297d124a1 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/bios/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/bios/Makefile
@@ -4,9 +4,7 @@
 
 BIOS = bios_parser.o bios_parser_interface.o  bios_parser_helper.o command_table.o command_table_helper.o
 
-ifdef CONFIG_DRM_AMD_DC_DCE12_0
 BIOS += command_table2.o command_table_helper2.o bios_parser2.o
-endif
 
 AMD_DAL_BIOS = $(addprefix $(AMDDALPATH)/dc/bios/,$(BIOS))
 
@@ -26,6 +24,4 @@ AMD_DISPLAY_FILES += $(AMDDALPATH)/dc/bios/dce110/command_table_helper_dce110.o
 
 AMD_DISPLAY_FILES += $(AMDDALPATH)/dc/bios/dce112/command_table_helper_dce112.o
 
-ifdef CONFIG_DRM_AMD_DC_DCE12_0
 AMD_DISPLAY_FILES += $(AMDDALPATH)/dc/bios/dce112/command_table_helper2_dce112.o
-endif

diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser_interface.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser_interface.c
index 7fe2a791ef424dbd5b23cb84966ec2ea6e2880c8..0079a1e26efde09707029e68b0cca15d8150fcae 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser_interface.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser_interface.c
@@ -29,9 +29,7 @@
 #include "bios_parser_interface.h"
 #include "bios_parser.h"
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 #include "bios_parser2.h"
-#endif
 
 
 struct dc_bios *dal_bios_parser_create(
@@ -40,17 +38,11 @@ struct dc_bios *dal_bios_parser_create(
 {
        struct dc_bios *bios = NULL;
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        bios = firmware_parser_create(init, dce_version);
 
+       /* Fall back to old bios parser for older asics */
        if (bios == NULL)
-               /* TODO: remove dce_version from bios_parser.
-                * cannot remove today because dal enum to bp enum translation is dce specific
-                */
                bios = bios_parser_create(init, dce_version);
-#else
-       bios = bios_parser_create(init, dce_version);
-#endif
 
        return bios;
 }

diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c b/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
index b0dcad260be6217e39d3931a053eb976caed3834..1cc3df1d56986edfab94ce191497aac6a346b5a2 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
@@ -53,11 +53,9 @@ bool dal_bios_parser_init_cmd_tbl_helper2(
        case DCE_VERSION_11_2:
                *h = dal_cmd_tbl_helper_dce112_get_table2();
                return true;
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        case DCE_VERSION_12_0:
                *h = dal_cmd_tbl_helper_dce112_get_table2();
                return true;
-#endif
 
        default:
                /* Unsupported DCE */

diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
index aa98762346d2be3a4465ddcc64e4eedafa1420ed..c855e49eb1162f6719e36df433dd8e7a853e80ac 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
+++ b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c
@@ -50,10 +50,8 @@ static enum bw_calcs_version bw_calcs_version_from_asic_id(struct hw_asic_id asi
                        return BW_CALCS_VERSION_POLARIS11;
                return BW_CALCS_VERSION_INVALID;
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        case FAMILY_AI:
                return BW_CALCS_VERSION_VEGA10;
-#endif
 
        default:
                return BW_CALCS_VERSION_INVALID;
@@ -2435,7 +2433,6 @@ void bw_calcs_init(struct bw_calcs_dceip *bw_dceip,
                dceip.scatter_gather_pte_request_rows_in_tiling_mode = 2;
                dceip.mcifwr_all_surfaces_burst_time = bw_int_to_fixed(0);
                break;
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        case BW_CALCS_VERSION_VEGA10:
                vbios.memory_type = bw_def_hbm;
                vbios.dram_channel_width_in_bits = 128;
@@ -2546,7 +2543,6 @@ void bw_calcs_init(struct bw_calcs_dceip *bw_dceip,
                dceip.scatter_gather_pte_request_rows_in_tiling_mode = 2;
                dceip.mcifwr_all_surfaces_burst_time = bw_int_to_fixed(0);
                break;
-#endif
        default:
                break;
        }

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 28ed8eaee1ffc3879104d148c5b91a5a81116159..d6041e84234747f7b2eb50117830e98e4ce6bc42 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1815,7 +1815,6 @@ void dc_link_remove_remote_sink(const struct dc_link *link, const struct dc_sink
        }
 }
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 bool dc_init_dchub(struct dc *dc, struct dchub_init_data *dh_data)
 {
        int i;
@@ -1842,5 +1841,4 @@ bool dc_init_dchub(struct dc *dc, struct dchub_init_data *dh_data)
        return true;
 
 }
-#endif
 

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_debug.c b/drivers/gpu/drm/amd/display/dc/core/dc_debug.c
index 079558ab81c059bc4057087ebbd51b6bdbcf378c..fb48b8909e7f86a95b096288991f6fc6fcdda9a8 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_debug.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_debug.c
@@ -142,10 +142,8 @@ void pre_surface_trace(
                                surface->rotation,
                                surface->stereo_format);
 
-#if defined (CONFIG_DRM_AMD_DC_DCE12_0)
                SURFACE_TRACE("surface->tiling_info.gfx9.swizzle = %d;\n",
                                surface->tiling_info.gfx9.swizzle);
-#endif
 
                SURFACE_TRACE("\n");
        }
@@ -228,10 +226,8 @@ void update_surface_trace(
                                        update->plane_info->tiling_info.gfx8.array_mode,
                                        update->plane_info->visible);
 
-                       #if defined (CONFIG_DRM_AMD_DC_DCE12_0)
-                                       SURFACE_TRACE("surface->tiling_info.gfx9.swizzle = %d;\n",
+                       SURFACE_TRACE("surface->tiling_info.gfx9.swizzle = %d;\n",
                                        update->plane_info->tiling_info.gfx9.swizzle);
-                       #endif
                }
 
                if (update->scaling_info) {

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index f13da7c227f4cf75c040e13a7bc9f5e07f97c91c..74dd272d745264819f20dab72233fc7ba2e3b4d8 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -1217,7 +1217,6 @@ static enum dc_status enable_link_dp(struct pipe_ctx *pipe_ctx)
                                pipe_ctx->dis_clk->funcs->set_min_clocks_state(
                                        pipe_ctx->dis_clk, DM_PP_CLOCKS_STATE_NOMINAL);
                } else {
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
                        uint32_t dp_phyclk_in_khz;
                        const struct clocks_value clocks_value =
                                        pipe_ctx->dis_clk->cur_clocks_value;
@@ -1235,7 +1234,6 @@ static enum dc_status enable_link_dp(struct pipe_ctx *pipe_ctx)
                                                false,
                                                true);
                        }
-#endif
                }
        }
 

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index 77ef3304d2bc05e87510ae46e060e46e28af05c3..ad37d0efca2e2488384db5ec9339484aec470ee6 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -39,9 +39,7 @@
 #include "dce100/dce100_resource.h"
 #include "dce110/dce110_resource.h"
 #include "dce112/dce112_resource.h"
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 #include "dce120/dce120_resource.h"
-#endif
 
 enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id)
 {
@@ -68,11 +66,9 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id)
                        dc_version = DCE_VERSION_11_2;
                }
                break;
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        case FAMILY_AI:
                dc_version = DCE_VERSION_12_0;
                break;
-#endif
        default:
                dc_version = DCE_VERSION_UNKNOWN;
                break;
@@ -105,12 +101,10 @@ struct resource_pool *dc_create_resource_pool(
                res_pool = dce112_create_resource_pool(
                        num_virtual_links, dc);
                break;
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        case DCE_VERSION_12_0:
                res_pool = dce120_create_resource_pool(
                        num_virtual_links, dc);
                break;
-#endif
        default:
                break;
        }

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index bc15065e489b59864151ff6eea4e25795b386b6e..106addc937cacc36830244da344ffa68c25dc2ad 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -55,9 +55,7 @@ struct dc_caps {
 struct dc_dcc_surface_param {
        enum surface_pixel_format format;
        struct dc_size surface_size;
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        enum swizzle_mode_values swizzle_mode;
-#endif
        enum dc_scan_direction scan;
 };
 
@@ -146,9 +144,7 @@ struct dc_debug {
        bool disable_stutter;
        bool disable_dcc;
        bool disable_dfs_bypass;
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        bool disable_pplib_clock_request;
-#endif
        bool disable_clock_gate;
        bool disable_dmcu;
        bool force_abm_enable;
@@ -163,7 +159,6 @@ struct dc {
        struct dc_debug debug;
 };
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 enum frame_buffer_mode {
        FRAME_BUFFER_MODE_LOCAL_ONLY = 0,
        FRAME_BUFFER_MODE_ZFB_ONLY,
@@ -178,7 +173,6 @@ struct dchub_init_data {
        uint64_t zfb_size_in_byte;
        enum frame_buffer_mode fb_mode;
 };
-#endif
 
 struct dc_init_data {
        struct hw_asic_id asic_id;
@@ -200,9 +194,7 @@ struct dc *dc_create(const struct dc_init_data *init_params);
 
 void dc_destroy(struct dc **dc);
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 bool dc_init_dchub(struct dc *dc, struct dchub_init_data *dh_data);
-#endif
 
 /*******************************************************************************
  * Surface Interfaces

diff --git a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
index 63813404276d274153372826dee817d23e87c80d..33e3377f69fee8b31bb1b206d12edd87f5ffeaf4 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
@@ -259,7 +259,6 @@ enum tile_mode_values {
        DC_ADDR_SURF_MICRO_TILING_NON_DISPLAY = 0x1,
 };
 
-#if defined (CONFIG_DRM_AMD_DC_DCE12_0)
 enum swizzle_mode_values {
        DC_SW_LINEAR = 0,
        DC_SW_256B_S = 1,
@@ -287,7 +286,6 @@ enum swizzle_mode_values {
        DC_SW_VAR_R_X = 31,
        DC_SW_MAX
 };
-#endif
 
 union dc_tiling_info {
 
@@ -353,7 +351,6 @@ union dc_tiling_info {
                enum array_mode_values array_mode;
        } gfx8;
 
-#if defined (CONFIG_DRM_AMD_DC_DCE12_0)
        struct {
                unsigned int num_pipes;
                unsigned int num_banks;
@@ -368,7 +365,6 @@ union dc_tiling_info {
                bool rb_aligned;
                bool pipe_aligned;
        } gfx9;
-#endif
 };
 
 /* Rotation angle */

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
index f53dc157db97ccf83da9301cfb9848e46b54b474..bd4524ef3a37ee1e6bdee8e755725926e347e4b5 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
@@ -585,9 +585,7 @@ static uint32_t dce110_get_pix_clk_dividers(
                        pll_settings, pix_clk_params);
                break;
        case DCE_VERSION_11_2:
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        case DCE_VERSION_12_0:
-#endif
                dce112_get_pix_clk_dividers_helper(clk_src,
                                pll_settings, pix_clk_params);
                break;
@@ -871,9 +869,7 @@ static bool dce110_program_pix_clk(
 
                break;
        case DCE_VERSION_11_2:
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        case DCE_VERSION_12_0:
-#endif
                if (clock_source->id != CLOCK_SOURCE_ID_DP_DTO) {
                        bp_pc_params.flags.SET_GENLOCK_REF_DIV_SRC =
                                                        pll_settings->use_external_clk;

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
index 9c743e51c0910141aaeebb6d156a99b4cb14092d..263f8900e39c0745d04a15d67d8f0911993e9b87 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
@@ -80,7 +80,6 @@ static struct state_dependent_clocks dce112_max_clks_by_state[] = {
 /*ClocksStatePerformance*/
 { .display_clk_khz = 1132000, .pixel_clk_khz = 600000 } };
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 static struct state_dependent_clocks dce120_max_clks_by_state[] = {
 /*ClocksStateInvalid - should not be used*/
 { .display_clk_khz = 0, .pixel_clk_khz = 0 },
@@ -92,7 +91,6 @@ static struct state_dependent_clocks dce120_max_clks_by_state[] = {
 { .display_clk_khz = 670000, .pixel_clk_khz = 600000 },
 /*ClocksStatePerformance*/
 { .display_clk_khz = 1133000, .pixel_clk_khz = 600000 } };
-#endif
 
 /* Starting point for each divider range.*/
 enum dce_divider_range_start {
@@ -497,7 +495,6 @@ static void dce_clock_read_ss_info(struct dce_disp_clk *clk_dce)
        }
 }
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 static bool dce_apply_clock_voltage_request(
        struct display_clock *clk,
        enum dm_pp_clock_type clocks_type,
@@ -592,7 +589,6 @@ static const struct display_clock_funcs dce120_funcs = {
        .apply_clock_voltage_request = dce_apply_clock_voltage_request,
        .set_clock = dce112_set_clock
 };
-#endif
 
 static const struct display_clock_funcs dce112_funcs = {
        .get_dp_ref_clk_frequency = dce_clocks_get_dp_ref_freq,
@@ -734,7 +730,6 @@ struct display_clock *dce112_disp_clk_create(
        return &clk_dce->base;
 }
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 struct display_clock *dce120_disp_clk_create(
                struct dc_context *ctx,
                const struct dce_disp_clk_registers *regs,
@@ -770,7 +765,6 @@ struct display_clock *dce120_disp_clk_create(
 
        return &clk_dce->base;
 }
-#endif
 
 void dce_disp_clk_destroy(struct display_clock **disp_clk)
 {

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.h b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.h
index 18787f6d4e2a06885e985fbccbd1ed8368133a44..2fd00e45395c027dfb12baf3971c06f7998376bc 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.h
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.h
@@ -45,13 +45,11 @@
        CLK_SF(MASTER_COMM_CMD_REG, MASTER_COMM_CMD_REG_BYTE0, mask_sh), \
        CLK_SF(MASTER_COMM_CNTL_REG, MASTER_COMM_INTERRUPT, mask_sh)
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 #define CLK_COMMON_MASK_SH_LIST_SOC_BASE(mask_sh) \
        CLK_SF(DCCG_DFS_DPREFCLK_CNTL, DPREFCLK_SRC_SEL, mask_sh), \
        CLK_SF(DCCG_DFS_DENTIST_DISPCLK_CNTL, DENTIST_DPREFCLK_WDIVIDER, mask_sh), \
        CLK_SF(DCCG_DFS_MASTER_COMM_CMD_REG, MASTER_COMM_CMD_REG_BYTE0, mask_sh), \
        CLK_SF(DCCG_DFS_MASTER_COMM_CNTL_REG, MASTER_COMM_INTERRUPT, mask_sh)
-#endif
 
 #define CLK_REG_FIELD_LIST(type) \
        type DPREFCLK_SRC_SEL; \
@@ -126,10 +124,8 @@ struct dce_disp_clk {
        int gpu_pll_ss_divider;
 
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        /* max disp_clk from PPLIB for max validation display clock*/
        int max_displ_clk_in_khz;
-#endif
 };
 
 
@@ -151,13 +147,11 @@ struct display_clock *dce112_disp_clk_create(
        const struct dce_disp_clk_shift *clk_shift,
        const struct dce_disp_clk_mask *clk_mask);
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 struct display_clock *dce120_disp_clk_create(
        struct dc_context *ctx,
        const struct dce_disp_clk_registers *regs,
        const struct dce_disp_clk_shift *clk_shift,
        const struct dce_disp_clk_mask *clk_mask);
-#endif
 
 void dce_disp_clk_destroy(struct display_clock **disp_clk);
 

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h b/drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h
index ff7984b080958021d91fee3dc94cea982c920f40..c66585188ecd3bba9272ddc1bd843139231b90d7 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h
@@ -186,13 +186,11 @@ struct dce_hwseq_registers {
        HWSEQ_DCE10_MASK_SH_LIST(mask_sh),\
        HWSEQ_PHYPLL_MASK_SH_LIST(mask_sh, CRTC0_)
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 #define HWSEQ_DCE12_MASK_SH_LIST(mask_sh)\
        HWSEQ_DCEF_MASK_SH_LIST(mask_sh, DCFE0_DCFE_),\
        HWSEQ_BLND_MASK_SH_LIST(mask_sh, BLND0_BLND_),\
        HWSEQ_PIXEL_RATE_MASK_SH_LIST(mask_sh, CRTC0_),\
        HWSEQ_PHYPLL_MASK_SH_LIST(mask_sh, CRTC0_)
-#endif
 
 #define HWSEQ_REG_FIED_LIST(type) \
        type DCFE_CLOCK_ENABLE; \

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
index f6a1006a647292890cdcca214ed32b066101f1af..25ba583dbb8f8000eff12338f6865a4f9afdcff5 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
@@ -31,12 +31,10 @@
 #define TO_DCE110_LINK_ENC(link_encoder)\
        container_of(link_encoder, struct dce110_link_encoder, base)
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 /* Not found regs in dce120 spec
  * BIOS_SCRATCH_2
  * DP_DPHY_INTERNAL_CTRL
  */
-#endif
 
 #define AUX_REG_LIST(id)\
        SRI(AUX_CONTROL, DP_AUX, id), \
@@ -86,16 +84,14 @@
        SRI(DP_DPHY_INTERNAL_CTRL, DP, id), \
        SR(DCI_MEM_PWR_STATUS)
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
-       #define LE_DCE120_REG_LIST(id)\
-               LE_COMMON_REG_LIST_BASE(id), \
-               SRI(DP_DPHY_BS_SR_SWAP_CNTL, DP, id), \
-               SR(DCI_MEM_PWR_STATUS)
-#endif
+#define LE_DCE120_REG_LIST(id)\
+       LE_COMMON_REG_LIST_BASE(id), \
+       SRI(DP_DPHY_BS_SR_SWAP_CNTL, DP, id), \
+       SR(DCI_MEM_PWR_STATUS)
 
-       #define LE_DCE80_REG_LIST(id)\
-               SRI(DP_DPHY_INTERNAL_CTRL, DP, id), \
-               LE_COMMON_REG_LIST_BASE(id)
+#define LE_DCE80_REG_LIST(id)\
+       SRI(DP_DPHY_INTERNAL_CTRL, DP, id), \
+       LE_COMMON_REG_LIST_BASE(id)
 
 
 struct dce110_link_enc_aux_registers {

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
index c494f712b5b541574d1d00f707cf550c04cd32ac..7acd8715281106cdcbd664a422ee9dddeda8d5f5 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
@@ -187,7 +187,7 @@ static void program_nbp_watermark(struct mem_input *mi,
                REG_UPDATE(DPG_PIPE_NB_PSTATE_CHANGE_CONTROL,
                                NB_PSTATE_CHANGE_WATERMARK, nbp_wm);
        }
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
+
        if (REG(DPG_PIPE_LOW_POWER_CONTROL)) {
                REG_UPDATE(DPG_WATERMARK_MASK_CONTROL,
                                PSTATE_CHANGE_WATERMARK_MASK, wm_select);
@@ -200,7 +200,6 @@ static void program_nbp_watermark(struct mem_input *mi,
                REG_UPDATE(DPG_PIPE_LOW_POWER_CONTROL,
                                PSTATE_CHANGE_WATERMARK, nbp_wm);
        }
-#endif
 }
 
 static void program_stutter_watermark(struct mem_input *mi,
@@ -210,12 +209,10 @@ static void program_stutter_watermark(struct mem_input *mi,
        REG_UPDATE(DPG_WATERMARK_MASK_CONTROL,
                STUTTER_EXIT_SELF_REFRESH_WATERMARK_MASK, wm_select);
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        if (REG(DPG_PIPE_STUTTER_CONTROL2))
                REG_UPDATE(DPG_PIPE_STUTTER_CONTROL2,
                                STUTTER_EXIT_SELF_REFRESH_WATERMARK, stutter_mark);
        else
-#endif
                REG_UPDATE(DPG_PIPE_STUTTER_CONTROL,
                                STUTTER_EXIT_SELF_REFRESH_WATERMARK, stutter_mark);
 }
@@ -254,7 +251,6 @@ void dce_mem_input_program_display_marks(struct mem_input *mi,
 static void program_tiling(struct mem_input *mi,
        const union dc_tiling_info *info)
 {
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        if (mi->masks->GRPH_SW_MODE) { /* GFX9 */
                REG_UPDATE_6(GRPH_CONTROL,
                                GRPH_SW_MODE, info->gfx9.swizzle,
@@ -268,7 +264,7 @@ static void program_tiling(struct mem_input *mi,
                GRPH_Z, 0);
                 */
        }
-#endif
+
        if (mi->masks->GRPH_ARRAY_MODE) { /* GFX8 */
                REG_UPDATE_9(GRPH_CONTROL,
                                GRPH_NUM_BANKS, info->gfx8.num_banks,

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h
index 9e18c2a34e85a2e9f107594cc9d74895fcba0ccf..6af533bdf98c7246902dcffbcde426db9afb83bf 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h
@@ -58,14 +58,12 @@
        MI_DCE11_2_REG_LIST(id),\
        MI_DCE_PTE_REG_LIST(id)
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 #define MI_DCE12_REG_LIST(id)\
        MI_DCE_BASE_REG_LIST(id),\
        MI_DCE_PTE_REG_LIST(id),\
        SRI(GRPH_PIPE_OUTSTANDING_REQUEST_LIMIT, DCP, id),\
        SRI(DPG_PIPE_STUTTER_CONTROL2, DMIF_PG, id),\
        SRI(DPG_PIPE_LOW_POWER_CONTROL, DMIF_PG, id)
-#endif
 
 struct dce_mem_input_registers {
        /* DCP */
@@ -172,7 +170,6 @@ struct dce_mem_input_registers {
        MI_DCE11_2_MASK_SH_LIST(mask_sh),\
        MI_DCP_PTE_MASK_SH_LIST(mask_sh, )
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 #define MI_GFX9_TILE_MASK_SH_LIST(mask_sh, blk)\
        SFB(blk, GRPH_CONTROL, GRPH_SW_MODE, mask_sh),\
        SFB(blk, GRPH_CONTROL, GRPH_SE_ENABLE, mask_sh),\
@@ -195,7 +192,6 @@ struct dce_mem_input_registers {
        MI_DMIF_PG_MASK_SH_LIST(mask_sh, DMIF_PG0_),\
        MI_DCE12_DMIF_PG_MASK_SH_LIST(mask_sh, DMIF_PG0_),\
        MI_GFX9_TILE_MASK_SH_LIST(mask_sh, DCP0_)
-#endif
 
 #define MI_REG_FIELD_LIST(type) \
        type GRPH_ENABLE; \

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_opp.h b/drivers/gpu/drm/amd/display/dc/dce/dce_opp.h
index 4784ced6fc80d82302d7f40ec27e729a1a5528e2..03ce9ba50b645d53a50acdea39894dde706ae7a8 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_opp.h
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_opp.h
@@ -107,13 +107,11 @@ enum dce110_opp_reg_type {
        SRI(FMT_TEMPORAL_DITHER_PROGRAMMABLE_PATTERN_T_MATRIX, FMT, id), \
        SRI(CONTROL, FMT_MEMORY, id)
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 #define OPP_DCE_120_REG_LIST(id) \
        OPP_COMMON_REG_LIST_BASE(id), \
        SRI(DCFE_MEM_PWR_CTRL, DCFE, id), \
        SRI(DCFE_MEM_PWR_STATUS, DCFE, id), \
        SRI(CONTROL, FMT_MEMORY, id)
-#endif
 
 #define OPP_SF(reg_name, field_name, post_fix)\
        .field_name = reg_name ## __ ## field_name ## post_fix
@@ -205,7 +203,6 @@ enum dce110_opp_reg_type {
        OPP_SF(DCFE_MEM_LIGHT_SLEEP_CNTL, DCP_LUT_LIGHT_SLEEP_DIS, mask_sh),\
        OPP_SF(DCFE_MEM_LIGHT_SLEEP_CNTL, REGAMMA_LUT_MEM_PWR_STATE, mask_sh)
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 #define OPP_COMMON_MASK_SH_LIST_DCE_120(mask_sh)\
        OPP_SF(DCFE0_DCFE_MEM_PWR_CTRL, DCP_REGAMMA_MEM_PWR_DIS, mask_sh),\
        OPP_SF(DCFE0_DCFE_MEM_PWR_CTRL, DCP_LUT_MEM_PWR_DIS, mask_sh),\
@@ -267,7 +264,6 @@ enum dce110_opp_reg_type {
        OPP_SF(FMT0_FMT_CONTROL, FMT_SUBSAMPLING_MODE, mask_sh),\
        OPP_SF(FMT0_FMT_CONTROL, FMT_SUBSAMPLING_ORDER, mask_sh),\
        OPP_SF(FMT0_FMT_CONTROL, FMT_CBCR_BIT_REDUCTION_BYPASS, mask_sh)
-#endif
 
 #define OPP_REG_FIELD_LIST(type) \
        type DCP_REGAMMA_MEM_PWR_DIS; \

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h
index c784c1b961c6878a1b01f8316fbbe4f673347f2a..c2f4050fc6dce3e8365432c873c726b4e5467019 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.h
@@ -187,7 +187,6 @@
 #define SE_COMMON_MASK_SH_LIST_DCE_COMMON(mask_sh)\
        SE_COMMON_MASK_SH_LIST_DCE_COMMON_BASE(mask_sh)
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 #define SE_COMMON_MASK_SH_LIST_SOC_BASE(mask_sh)\
        SE_SF(DIG0_AFMT_VBI_PACKET_CONTROL, AFMT_GENERIC_INDEX, mask_sh),\
        SE_SF(DIG0_AFMT_GENERIC_HDR, AFMT_GENERIC_HB0, mask_sh),\
@@ -267,7 +266,6 @@
        SE_SF(DIG0_HDMI_CONTROL, HDMI_CLOCK_CHANNEL_RATE, mask_sh),\
        SE_SF(DIG0_DIG_FE_CNTL, TMDS_PIXEL_ENCODING, mask_sh),\
        SE_SF(DIG0_DIG_FE_CNTL, TMDS_COLOR_FORMAT, mask_sh)
-#endif
 
 #define SE_COMMON_MASK_SH_LIST_SOC(mask_sh)\
        SE_COMMON_MASK_SH_LIST_SOC_BASE(mask_sh)
@@ -294,7 +292,6 @@
        SE_SF(DIG_FE_CNTL, TMDS_COLOR_FORMAT, mask_sh),\
        SE_SF(DP_VID_TIMING, DP_VID_M_DOUBLE_VALUE_EN, mask_sh)
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 #define SE_COMMON_MASK_SH_LIST_DCE120(mask_sh)\
        SE_COMMON_MASK_SH_LIST_SOC(mask_sh),\
        SE_SF(DIG0_AFMT_VBI_PACKET_CONTROL, AFMT_GENERIC0_UPDATE, mask_sh),\
@@ -307,7 +304,6 @@
        SE_SF(DP0_DP_SEC_CNTL, DP_SEC_AVI_ENABLE, mask_sh),\
        SE_SF(DIG0_AFMT_AVI_INFO3, AFMT_AVI_INFO_VERSION, mask_sh),\
        SE_SF(DP0_DP_VID_TIMING, DP_VID_M_DOUBLE_VALUE_EN, mask_sh)
-#endif
 
 struct dce_stream_encoder_shift {
        uint8_t AFMT_GENERIC_INDEX;

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_transform.h b/drivers/gpu/drm/amd/display/dc/dce/dce_transform.h
index aa6bc4fc80c5db7e7bcb9e2114387c898189f45f..da2a02434665696c38c621d9348fa08cebfbe1bb 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_transform.h
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_transform.h
@@ -153,7 +153,6 @@
        XFM_SF(DCFE_MEM_PWR_STATUS, SCL_COEFF_MEM_PWR_STATE, mask_sh), \
        XFM_SF(SCL_MODE, SCL_PSCL_EN, mask_sh)
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 #define XFM_COMMON_MASK_SH_LIST_SOC_BASE(mask_sh) \
        XFM_SF(DCP0_OUT_CLAMP_CONTROL_B_CB, OUT_CLAMP_MIN_B_CB, mask_sh), \
        XFM_SF(DCP0_OUT_CLAMP_CONTROL_B_CB, OUT_CLAMP_MAX_B_CB, mask_sh), \
@@ -219,7 +218,6 @@
        XFM_SF(DCFE0_DCFE_MEM_PWR_CTRL, SCL_COEFF_MEM_PWR_DIS, mask_sh), \
        XFM_SF(DCFE0_DCFE_MEM_PWR_STATUS, SCL_COEFF_MEM_PWR_STATE, mask_sh), \
        XFM_SF(SCL0_SCL_MODE, SCL_PSCL_EN, mask_sh)
-#endif
 
 #define XFM_REG_FIELD_LIST(type) \
        type OUT_CLAMP_MIN_B_CB; \

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
index 66d5f346f195febd5c3930eb8f1c0918f52094cf..cb7a673e15e9b21871cbe120ad72e38b1c9fc51d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -1427,8 +1427,6 @@ static void apply_min_clocks(
                        return;
                }
 
-               /* TODOFPGA */
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
                /* TODO: This is incorrect. Figure out how to fix. */
                pipe_ctx->dis_clk->funcs->apply_clock_voltage_request(
                                pipe_ctx->dis_clk,
@@ -1451,7 +1449,6 @@ static void apply_min_clocks(
                                pre_mode_set,
                                false);
                return;
-#endif
        }
 
        /* get the required state based on state dependent clocks:
@@ -1468,7 +1465,6 @@ static void apply_min_clocks(
                pipe_ctx->dis_clk->funcs->set_min_clocks_state(
                        pipe_ctx->dis_clk, *clocks_state);
        } else {
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
                pipe_ctx->dis_clk->funcs->apply_clock_voltage_request(
                                pipe_ctx->dis_clk,
                                DM_PP_CLOCK_TYPE_DISPLAY_CLK,
@@ -1489,7 +1485,6 @@ static void apply_min_clocks(
                                req_clocks.pixel_clk_khz,
                                pre_mode_set,
                                false);
-#endif
        }
 }
 

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input.c
index 3ffb845f843a88ce936ca2b5080584dac04fa369..a20feaedfca4f886b94ad525782a26e0e2fb5f0f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input.c
@@ -409,9 +409,7 @@ static struct mem_input_funcs dce110_mem_input_funcs = {
                        dce_mem_input_program_surface_config,
        .mem_input_is_flip_pending =
                        dce110_mem_input_is_flip_pending,
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        .mem_input_update_dchub = NULL
-#endif
 };
 /*****************************************/
 /* Constructor, Destructor               */

diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h b/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h
index 55f0a94e7cae7f887d3fb711b2f5cc213743d1b6..378509b8e56c632bf91709c22c7349dbd9b03bea 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_timing_generator.h
@@ -108,9 +108,7 @@ struct dce110_timing_generator {
        uint32_t min_h_front_porch;
        uint32_t min_h_back_porch;
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        /* DCE 12 */
-#endif
        uint32_t min_h_sync_width;
        uint32_t min_v_sync_width;
        uint32_t min_v_blank;

diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
index 9a1984b365922705ce1e879730395ad18877dd60..efa58889058b4a6cfd416f9774722fb3392e0b2b 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
@@ -909,6 +909,7 @@ static bool construct(
 {
        unsigned int i;
        struct dc_context *ctx = dc->ctx;
+       struct irq_service_init_data irq_init_data;
 
        ctx->dc_bios->regs = &bios_regs;
 
@@ -997,15 +998,10 @@ static bool construct(
                goto res_create_fail;
        }
 
-       {
-       #if defined(CONFIG_DRM_AMD_DC_DCE12_0)
-               struct irq_service_init_data init_data;
-               init_data.ctx = dc->ctx;
-               pool->base.irqs = dal_irq_service_dce120_create(&init_data);
-               if (!pool->base.irqs)
-                       goto irqs_create_fail;
-       #endif
-       }
+       irq_init_data.ctx = dc->ctx;
+       pool->base.irqs = dal_irq_service_dce120_create(&irq_init_data);
+       if (!pool->base.irqs)
+               goto irqs_create_fail;
 
        for (i = 0; i < pool->base.pipe_count; i++) {
                pool->base.timing_generators[i] =

diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_mem_input.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_mem_input.c
index 2f22931f457bf09f56ff06815367fe3d7a94449a..ebb8df3cdf4afdaceba9bc8b674c82ebb68737e8 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_mem_input.c
+++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_mem_input.c
@@ -54,9 +54,7 @@ static struct mem_input_funcs dce80_mem_input_funcs = {
                        dce_mem_input_program_surface_config,
        .mem_input_is_flip_pending =
                        dce110_mem_input_is_flip_pending,
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        .mem_input_update_dchub = NULL
-#endif
 };
 
 /*****************************************/

diff --git a/drivers/gpu/drm/amd/display/dc/dm_services.h b/drivers/gpu/drm/amd/display/dc/dm_services.h
index bdc7cb045eedccb5880e57f8752e7ac5d74fa178..cf6ecfcadd5efb10b0092b5c0e372c4edb22375b 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dm_services.h
+++ b/drivers/gpu/drm/amd/display/dc/dm_services.h
@@ -192,7 +192,6 @@ unsigned int generic_reg_wait(const struct dc_context *ctx,
        unsigned int delay_between_poll_us, unsigned int time_out_num_tries,
        const char *func_name);
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 
 /* These macros need to be used with soc15 registers in order to retrieve
  * the actual offset.
@@ -274,7 +273,6 @@ static inline bool wait_reg_func(
                20000,\
                200000)
 
-#endif
 /**************************************
  * Power Play (PP) interfaces
  **************************************/
@@ -337,11 +335,9 @@ bool dm_pp_notify_wm_clock_changes(
        const struct dc_context *ctx,
        struct dm_pp_wm_sets_with_clock_ranges *wm_with_clock_ranges);
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 bool dm_pp_notify_wm_clock_changes_soc15(
        const struct dc_context *ctx,
        struct dm_pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges);
-#endif
 
 /* DAL calls this function to notify PP about completion of Mode Set.
  * For PP it means that current DCE clocks are those which were returned

diff --git a/drivers/gpu/drm/amd/display/dc/dm_services_types.h b/drivers/gpu/drm/amd/display/dc/dm_services_types.h
index 8d2661583f212e6d6aeaa08654ee8bda5619ddd8..c631dec489e7c64fbb77ca9a99f6b9f3f4c6df99 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dm_services_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dm_services_types.h
@@ -141,7 +141,6 @@ struct dm_pp_wm_sets_with_clock_ranges {
        struct dm_pp_clock_range_for_wm_set wm_clk_ranges[MAX_WM_SETS];
 };
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 struct dm_pp_clock_range_for_dmif_wm_set_soc15 {
        enum dm_pp_wm_set_id wm_set_id;
        uint32_t wm_min_dcfclk_clk_in_khz;
@@ -166,7 +165,6 @@ struct dm_pp_wm_sets_with_clock_ranges_soc15 {
        struct dm_pp_clock_range_for_mcif_wm_set_soc15
                wm_mcif_clocks_ranges[MAX_WM_SETS];
 };
-#endif
 
 #define MAX_DISPLAY_CONFIGS 6
 

diff --git a/drivers/gpu/drm/amd/display/dc/gpio/Makefile b/drivers/gpu/drm/amd/display/dc/gpio/Makefile
index 8cf12a8ca28f738b2406902ac211da8fccec3417..5e831aff4830f12751fea3cd702e7b468e0ffb2c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/gpio/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/gpio/Makefile
@@ -31,13 +31,11 @@ AMD_DISPLAY_FILES += $(AMD_DAL_GPIO_DCE110)
 ###############################################################################
 # DCE 12x
 ###############################################################################
-ifdef CONFIG_DRM_AMD_DC_DCE12_0
 GPIO_DCE120 = hw_translate_dce120.o hw_factory_dce120.o
 
 AMD_DAL_GPIO_DCE120 = $(addprefix $(AMDDALPATH)/dc/gpio/dce120/,$(GPIO_DCE120))
 
 AMD_DISPLAY_FILES += $(AMD_DAL_GPIO_DCE120)
-endif
 
 ###############################################################################
 # Diagnostics on FPGA

diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c b/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
index 66ea3b31b98064f6b8b43d952f5d7b9a56e6c6fa..29ba83d2c2118548e256831b1ba579c7bad13acf 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
+++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
@@ -44,9 +44,7 @@
 
 #include "dce110/hw_factory_dce110.h"
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 #include "dce120/hw_factory_dce120.h"
-#endif
 
 #include "diagnostics/hw_factory_diag.h"
 
@@ -76,11 +74,9 @@ bool dal_hw_factory_init(
        case DCE_VERSION_11_2:
                dal_hw_factory_dce110_init(factory);
                return true;
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        case DCE_VERSION_12_0:
                dal_hw_factory_dce120_init(factory);
                return true;
-#endif
        default:
                ASSERT_CRITICAL(false);
                return false;

diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c b/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c
index 10e86447f179ed6d77876af0a46a275343e2ca30..872edda545363ec4556fd4ca558bfcd0d95d6f19 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c
+++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c
@@ -42,9 +42,7 @@
 
 #include "dce80/hw_translate_dce80.h"
 #include "dce110/hw_translate_dce110.h"
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 #include "dce120/hw_translate_dce120.h"
-#endif
 #include "diagnostics/hw_translate_diag.h"
 
 /*
@@ -70,11 +68,9 @@ bool dal_hw_translate_init(
        case DCE_VERSION_11_2:
                dal_hw_translate_dce110_init(translate);
                return true;
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        case DCE_VERSION_12_0:
                dal_hw_translate_dce120_init(translate);
                return true;
-#endif
        default:
                BREAK_TO_DEBUGGER();
                return false;

diff --git a/drivers/gpu/drm/amd/display/dc/i2caux/Makefile b/drivers/gpu/drm/amd/display/dc/i2caux/Makefile
index 99aa5d8fb9a7e4e1cdb9d55b12210f54ccbd7b2f..a636768d06d51c1d6191cdba7705c3941a6cb669 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/i2caux/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/i2caux/Makefile
@@ -50,13 +50,11 @@ AMD_DISPLAY_FILES += $(AMD_DAL_I2CAUX_DCE112)
 ###############################################################################
 # DCE 120 family
 ###############################################################################
-ifdef CONFIG_DRM_AMD_DC_DCE12_0
 I2CAUX_DCE120 = i2caux_dce120.o
 
 AMD_DAL_I2CAUX_DCE120 = $(addprefix $(AMDDALPATH)/dc/i2caux/dce120/,$(I2CAUX_DCE120))
 
 AMD_DISPLAY_FILES += $(AMD_DAL_I2CAUX_DCE120)
-endif
 
 ###############################################################################
 # Diagnostics on FPGA

diff --git a/drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c b/drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c
index ea3bd75e0555a72a6c8cb9c651e5eb8b88ba4fb8..bd84b932aaaef195dc198fb18ccc1c79e563ab04 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c
+++ b/drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c
@@ -57,9 +57,7 @@
 
 #include "dce112/i2caux_dce112.h"
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 #include "dce120/i2caux_dce120.h"
-#endif
 
 #include "diagnostics/i2caux_diag.h"
 
@@ -84,10 +82,8 @@ struct i2caux *dal_i2caux_create(
                return dal_i2caux_dce110_create(ctx);
        case DCE_VERSION_10_0:
                return dal_i2caux_dce100_create(ctx);
-       #if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        case DCE_VERSION_12_0:
                return dal_i2caux_dce120_create(ctx);
-       #endif
        default:
                BREAK_TO_DEBUGGER();
                return NULL;

diff --git a/drivers/gpu/drm/amd/display/dc/inc/bandwidth_calcs.h b/drivers/gpu/drm/amd/display/dc/inc/bandwidth_calcs.h
index a7eaecd32aeaee29f1921285ce22672f4e23e6b8..81fab9ef3637e07a7591dbc0a3af26512c80ec2e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/bandwidth_calcs.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/bandwidth_calcs.h
@@ -40,9 +40,7 @@ enum bw_calcs_version {
        BW_CALCS_VERSION_POLARIS10,
        BW_CALCS_VERSION_POLARIS11,
        BW_CALCS_VERSION_STONEY,
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        BW_CALCS_VERSION_VEGA10
-#endif
 };
 
 /*******************************************************************************

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/display_clock.h b/drivers/gpu/drm/amd/display/dc/inc/hw/display_clock.h
index bf77aa6172e1d68c134cc456faa512da9730a8f0..79aa75c150ec768b6e3ece3f821afc1bf37da1e2 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/display_clock.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/display_clock.h
@@ -28,7 +28,6 @@
 
 #include "dm_services_types.h"
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 struct clocks_value {
        int dispclk_in_khz;
        int max_pixelclk_in_khz;
@@ -38,7 +37,6 @@ struct clocks_value {
        bool pixelclk_notify_pplib_done;
        bool phyclk_notigy_pplib_done;
 };
-#endif
 
 /* Structure containing all state-dependent clocks
  * (dependent on "enum clocks_state") */
@@ -53,9 +51,7 @@ struct display_clock {
 
        enum dm_pp_clocks_state max_clks_state;
        enum dm_pp_clocks_state cur_min_clks_state;
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        struct clocks_value cur_clocks_value;
-#endif
 };
 
 struct display_clock_funcs {
@@ -71,14 +67,12 @@ struct display_clock_funcs {
 
        int (*get_dp_ref_clk_frequency)(struct display_clock *disp_clk);
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        bool (*apply_clock_voltage_request)(
                struct display_clock *disp_clk,
                enum dm_pp_clock_type clocks_type,
                int clocks_in_khz,
                bool pre_mode_set,
                bool update_dp_phyclk);
-#endif
 };
 
 #endif /* __DISPLAY_CLOCK_H__ */

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h b/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h
index 6c0600696d02250cc377787483d5eea10ac9b630..7ec4027700d84071ff35130180c20bd28eb44341 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h
@@ -100,10 +100,8 @@ struct mem_input_funcs {
 
        bool (*mem_input_is_flip_pending)(struct mem_input *mem_input);
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        void (*mem_input_update_dchub)(struct mem_input *mem_input,
                        struct dchub_init_data *dh_data);
-#endif
 };
 
 #endif

diff --git a/drivers/gpu/drm/amd/display/dc/irq/Makefile b/drivers/gpu/drm/amd/display/dc/irq/Makefile
index 140e49811dd152d67465d806354e4e2f048fe4f7..222f36e3074f6aa8f8fa14bdd432105496f33b1a 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/irq/Makefile
+++ b/drivers/gpu/drm/amd/display/dc/irq/Makefile
@@ -30,11 +30,9 @@ AMD_DISPLAY_FILES += $(AMD_DAL_IRQ_DCE11)
 ###############################################################################
 # DCE 12x
 ###############################################################################
-ifdef CONFIG_DRM_AMD_DC_DCE12_0
 IRQ_DCE12 = irq_service_dce120.o
 
 AMD_DAL_IRQ_DCE12 = $(addprefix $(AMDDALPATH)/dc/irq/dce120/,$(IRQ_DCE12))
 
 AMD_DISPLAY_FILES += $(AMD_DAL_IRQ_DCE12)
-endif
 

diff --git a/drivers/gpu/drm/amd/display/dc/irq/irq_service.c b/drivers/gpu/drm/amd/display/dc/irq/irq_service.c
index a1b6d83b1cbba93640d90c938cdb46b8b0aab72f..5255c14254df7c653b52ec43b5bbe4436bcb2854 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/irq/irq_service.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/irq_service.c
@@ -33,9 +33,7 @@
 
 #include "dce80/irq_service_dce80.h"
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 #include "dce120/irq_service_dce120.h"
-#endif
 
 #include "reg_helper.h"
 #include "irq_service.h"

diff --git a/drivers/gpu/drm/amd/display/include/dal_asic_id.h b/drivers/gpu/drm/amd/display/include/dal_asic_id.h
index 15c0b8c14b300b6b054c558f90ff31a2d35c250a..6dab058f8f3c041bc6ed3d74a47a161b1b6c8ea7 100644 (file)
--- a/drivers/gpu/drm/amd/display/include/dal_asic_id.h
+++ b/drivers/gpu/drm/amd/display/include/dal_asic_id.h
@@ -123,9 +123,7 @@
 #define FAMILY_VI 130 /* Volcanic Islands: Iceland (V), Tonga (M) */
 #define FAMILY_CZ 135 /* Carrizo */
 
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
 #define FAMILY_AI 141
-#endif
 
 #define        FAMILY_UNKNOWN 0xFF
 

diff --git a/drivers/gpu/drm/amd/display/include/dal_types.h b/drivers/gpu/drm/amd/display/include/dal_types.h
index e24c1ef58d2fa0eb21e4669b2b94af9745321a73..0cefde14aa02f66f8b025a15e1db87c3e03eaa13 100644 (file)
--- a/drivers/gpu/drm/amd/display/include/dal_types.h
+++ b/drivers/gpu/drm/amd/display/include/dal_types.h
@@ -38,9 +38,7 @@ enum dce_version {
        DCE_VERSION_10_0,
        DCE_VERSION_11_0,
        DCE_VERSION_11_2,
-#if defined(CONFIG_DRM_AMD_DC_DCE12_0)
        DCE_VERSION_12_0,
-#endif
        DCE_VERSION_MAX,
 };