drm/amd/display: Clean up unused code

[WHAT]
Silence warning by cleaning up unused code.

Reviewed-by: Dillon Varone <dillon.varone@amd.com>
Signed-off-by: Clay King <clayking@amd.com>
Signed-off-by: Alex Hung <alex.hung@amd.com>
Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c
index b0aba3a6f13c23b7baf9a0a4c8f1bf6382040a4d..b48522480dfd987347f2c438fc8c3a288d41896d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c
+++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c
@@ -547,6 +547,7 @@ void dcn3_clk_mgr_construct(
        /* in case we don't get a value from the register, use default */
        if (clk_mgr->base.dentist_vco_freq_khz == 0)
                clk_mgr->base.dentist_vco_freq_khz = 3650000;
+
        /* Convert dprefclk units from MHz to KHz */
        /* Value already divided by 10, some resolution lost */
 

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 c9fbb64d706a2dbc5ae0a7bee1efe911deccd425..8271b12c1a66d52173cd62ed9a9e677945d36cb9 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -2431,7 +2431,6 @@ static void resource_log_pipe_for_stream(struct dc *dc, struct dc_state *state,
 
        int slice_idx, dpp_idx, plane_idx, slice_count, dpp_count;
        bool is_primary;
-       DC_LOGGER_INIT(dc->ctx->logger);
 
        slice_count = resource_get_opp_heads_for_otg_master(otg_master,
                        &state->res_ctx, opp_heads);

diff --git a/drivers/gpu/drm/amd/display/dc/dc_trace.h b/drivers/gpu/drm/amd/display/dc/dc_trace.h
index bbec308a3a5e2b2f3d504d24c07fa9f8b6315251..b7a011646d533817b611e701c1165a774761f26e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_trace.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_trace.h
@@ -23,8 +23,8 @@
 
 #include "amdgpu_dm_trace.h"
 
-#define TRACE_DC_PIPE_STATE(pipe_ctx, index, max_pipes) \
-       for (index = 0; index < max_pipes; ++index) { \
+#define TRACE_DC_PIPE_STATE(pipe_ctx, max_pipes) \
+       for (int index = 0; index < max_pipes; ++index) { \
                struct pipe_ctx *pipe_ctx = &dc->current_state->res_ctx.pipe_ctx[index]; \
                if (pipe_ctx->plane_state) \
                        trace_amdgpu_dm_dc_pipe_state(pipe_ctx->pipe_idx, pipe_ctx->plane_state, \

diff --git a/drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c
index 941dce439e979362c8ddf53e3c2b2295cf0b4f46..b0a4b68cf359a5a171a576a7398ad859d4c00da2 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c
+++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c
@@ -1151,8 +1151,6 @@ void dcn401_program_compbuf_segments(struct hubbub *hubbub, unsigned compbuf_siz
 {
        struct dcn20_hubbub *hubbub2 = TO_DCN20_HUBBUB(hubbub);
 
-       unsigned int cur_compbuf_size_seg = 0;
-
        if (safe_to_increase || compbuf_size_seg <= hubbub2->compbuf_size_segments) {
                if (compbuf_size_seg > hubbub2->compbuf_size_segments) {
                        REG_WAIT(DCHUBBUB_DET0_CTRL, DET0_SIZE_CURRENT, hubbub2->det0_size, 1, 100);
@@ -1165,8 +1163,6 @@ void dcn401_program_compbuf_segments(struct hubbub *hubbub, unsigned compbuf_siz
                                + hubbub2->det3_size + compbuf_size_seg <= hubbub2->crb_size_segs);
                REG_UPDATE(DCHUBBUB_COMPBUF_CTRL, COMPBUF_SIZE, compbuf_size_seg);
                hubbub2->compbuf_size_segments = compbuf_size_seg;
-
-               ASSERT(REG_GET(DCHUBBUB_COMPBUF_CTRL, CONFIG_ERROR, &cur_compbuf_size_seg) && !cur_compbuf_size_seg);
        }
 }
 

diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
index 8aafd460c36fd71eeeedcb3170fbe07e991b7ce3..38a5f312ddb4bdb9b31b245b8fca35280caa194f 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
@@ -86,9 +86,9 @@
        hws->ctx
 
 #define DC_LOGGER \
-       ctx->logger
-#define DC_LOGGER_INIT() \
-       struct dc_context *ctx = dc->ctx
+       dc_ctx->logger
+#define DC_LOGGER_INIT(ctx) \
+       struct dc_context *dc_ctx = ctx
 
 #define REG(reg)\
        hws->regs->reg
@@ -687,7 +687,7 @@ dce110_external_encoder_control(enum bp_external_encoder_control_action action,
                .pixel_clock = timing ? timing->pix_clk_100hz / 10 : 300000,
                .color_depth = timing ? timing->display_color_depth : COLOR_DEPTH_888,
        };
-       DC_LOGGER_INIT();
+       DC_LOGGER_INIT(dc->ctx);
 
        bp_result = bios->funcs->external_encoder_control(bios, &ext_cntl);
 
@@ -767,13 +767,14 @@ void dce110_edp_wait_for_hpd_ready(
                struct dc_link *link,
                bool power_up)
 {
-       struct dc_context *ctx = link->ctx;
        struct graphics_object_id connector = link->link_enc->connector;
        bool edp_hpd_high = false;
        uint32_t time_elapsed = 0;
        uint32_t timeout = power_up ?
                PANEL_POWER_UP_TIMEOUT : PANEL_POWER_DOWN_TIMEOUT;
 
+       DC_LOGGER_INIT(link->ctx);
+
        if (dal_graphics_object_id_get_connector_id(connector)
                        != CONNECTOR_ID_EDP) {
                BREAK_TO_DEBUGGER();
@@ -825,6 +826,7 @@ void dce110_edp_power_control(
        enum bp_result bp_result;
        uint8_t pwrseq_instance;
 
+       DC_LOGGER_INIT(ctx);
 
        if (dal_graphics_object_id_get_connector_id(link->link_enc->connector)
                        != CONNECTOR_ID_EDP) {
@@ -993,6 +995,8 @@ void dce110_edp_backlight_control(
        unsigned int pre_T11_delay = (link->dpcd_sink_ext_caps.bits.oled ? OLED_PRE_T11_DELAY : 0);
        unsigned int post_T7_delay = (link->dpcd_sink_ext_caps.bits.oled ? OLED_POST_T7_DELAY : 0);
 
+       DC_LOGGER_INIT(ctx);
+
        if (dal_graphics_object_id_get_connector_id(link->link_enc->connector)
                != CONNECTOR_ID_EDP) {
                BREAK_TO_DEBUGGER();
@@ -1969,8 +1973,7 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)
        bool keep_edp_vdd_on = false;
        bool should_clean_dsc_block = true;
        struct dc_bios *dcb = dc->ctx->dc_bios;
-       DC_LOGGER_INIT();
-
+       DC_LOGGER_INIT(dc->ctx);
 
        get_edp_links_with_sink(dc, edp_links_with_sink, &edp_with_sink_num);
        dc_get_edp_links(dc, edp_links, &edp_num);
@@ -2736,7 +2739,6 @@ static bool wait_for_reset_trigger_to_occur(
        struct dc_context *dc_ctx,
        struct timing_generator *tg)
 {
-       struct dc_context *ctx = dc_ctx;
        bool rc = false;
 
        /* To avoid endless loop we wait at most
@@ -2778,10 +2780,9 @@ static void dce110_enable_timing_synchronization(
                int group_size,
                struct pipe_ctx *grouped_pipes[])
 {
-       struct dc_context *dc_ctx = dc->ctx;
        struct dcp_gsl_params gsl_params = { 0 };
        int i;
-       DC_LOGGER_INIT();
+       DC_LOGGER_INIT(dc->ctx);
 
        DC_SYNC_INFO("GSL: Setting-up...\n");
 
@@ -2824,10 +2825,9 @@ static void dce110_enable_per_frame_crtc_position_reset(
                int group_size,
                struct pipe_ctx *grouped_pipes[])
 {
-       struct dc_context *dc_ctx = dc->ctx;
        struct dcp_gsl_params gsl_params = { 0 };
        int i;
-       DC_LOGGER_INIT();
+       DC_LOGGER_INIT(dc->ctx);
 
        gsl_params.gsl_group = 0;
        gsl_params.gsl_master = 0;

diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
index a2d28be480e818b324ad581734f6aa79726de802..17ff66d9a6172e4d8e61ea4a53ff0a931f5added 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c
@@ -60,9 +60,9 @@
 #include "dc_state_priv.h"
 
 #define DC_LOGGER \
-       dc_logger
-#define DC_LOGGER_INIT(logger) \
-       struct dal_logger *dc_logger = logger
+       dc_ctx->logger
+#define DC_LOGGER_INIT(ctx) \
+       struct dc_context *dc_ctx = ctx
 
 #define CTX \
        hws->ctx
@@ -1009,7 +1009,7 @@ static void power_on_plane_resources(
        struct dce_hwseq *hws,
        int plane_id)
 {
-       DC_LOGGER_INIT(hws->ctx->logger);
+       DC_LOGGER_INIT(hws->ctx);
 
        if (hws->funcs.dpp_root_clock_control)
                hws->funcs.dpp_root_clock_control(hws, plane_id, true);
@@ -1286,7 +1286,7 @@ static void dcn10_reset_back_end_for_pipe(
 {
        int i;
        struct dc_link *link;
-       DC_LOGGER_INIT(dc->ctx->logger);
+       DC_LOGGER_INIT(dc->ctx);
        if (pipe_ctx->stream_res.stream_enc == NULL) {
                pipe_ctx->stream = NULL;
                return;
@@ -1422,12 +1422,10 @@ void dcn10_verify_allow_pstate_change_high(struct dc *dc)
                return;
 
        if (!hubbub->funcs->verify_allow_pstate_change_high(hubbub)) {
-               int i = 0;
-
                if (should_log_hw_state)
                        dcn10_log_hw_state(dc, NULL);
 
-               TRACE_DC_PIPE_STATE(pipe_ctx, i, MAX_PIPES);
+               TRACE_DC_PIPE_STATE(pipe_ctx, MAX_PIPES);
                BREAK_TO_DEBUGGER();
                if (dcn10_hw_wa_force_recovery(dc)) {
                        /*check again*/
@@ -1490,7 +1488,7 @@ void dcn10_plane_atomic_power_down(struct dc *dc,
                struct hubp *hubp)
 {
        struct dce_hwseq *hws = dc->hwseq;
-       DC_LOGGER_INIT(dc->ctx->logger);
+       DC_LOGGER_INIT(dc->ctx);
 
        if (REG(DC_IP_REQUEST_CNTL)) {
                REG_SET(DC_IP_REQUEST_CNTL, 0,
@@ -1554,7 +1552,7 @@ void dcn10_plane_atomic_disable(struct dc *dc, struct pipe_ctx *pipe_ctx)
 void dcn10_disable_plane(struct dc *dc, struct dc_state *state, struct pipe_ctx *pipe_ctx)
 {
        struct dce_hwseq *hws = dc->hwseq;
-       DC_LOGGER_INIT(dc->ctx->logger);
+       DC_LOGGER_INIT(dc->ctx);
 
        if (!pipe_ctx->plane_res.hubp || pipe_ctx->plane_res.hubp->power_gated)
                return;
@@ -2268,8 +2266,6 @@ static bool wait_for_reset_trigger_to_occur(
 {
        bool rc = false;
 
-       DC_LOGGER_INIT(dc_ctx->logger);
-
        /* To avoid endless loop we wait at most
         * frames_to_wait_on_triggered_reset frames for the reset to occur. */
        const uint32_t frames_to_wait_on_triggered_reset = 10;
@@ -2384,7 +2380,6 @@ static uint8_t get_clock_divider(struct pipe_ctx *pipe,
 static int dcn10_align_pixel_clocks(struct dc *dc, int group_size,
                                    struct pipe_ctx *grouped_pipes[])
 {
-       struct dc_context *dc_ctx = dc->ctx;
        int i, master = -1, embedded = -1;
        struct dc_crtc_timing *hw_crtc_timing;
        uint64_t phase[MAX_PIPES];
@@ -2397,7 +2392,7 @@ static int dcn10_align_pixel_clocks(struct dc *dc, int group_size,
        uint32_t dp_ref_clk_100hz =
                dc->res_pool->dp_clock_source->ctx->dc->clk_mgr->dprefclk_khz*10;
 
-       DC_LOGGER_INIT(dc_ctx->logger);
+       DC_LOGGER_INIT(dc->ctx);
 
        hw_crtc_timing = kzalloc_objs(*hw_crtc_timing, MAX_PIPES);
        if (!hw_crtc_timing)
@@ -2477,12 +2472,11 @@ void dcn10_enable_vblanks_synchronization(
        int group_size,
        struct pipe_ctx *grouped_pipes[])
 {
-       struct dc_context *dc_ctx = dc->ctx;
        struct output_pixel_processor *opp;
        struct timing_generator *tg;
        int i, width = 0, height = 0, master;
 
-       DC_LOGGER_INIT(dc_ctx->logger);
+       DC_LOGGER_INIT(dc->ctx);
 
        for (i = 1; i < group_size; i++) {
                opp = grouped_pipes[i]->stream_res.opp;
@@ -2543,12 +2537,11 @@ void dcn10_enable_timing_synchronization(
        int group_size,
        struct pipe_ctx *grouped_pipes[])
 {
-       struct dc_context *dc_ctx = dc->ctx;
        struct output_pixel_processor *opp;
        struct timing_generator *tg;
        int i, width = 0, height = 0;
 
-       DC_LOGGER_INIT(dc_ctx->logger);
+       DC_LOGGER_INIT(dc->ctx);
 
        DC_SYNC_INFO("Setting up OTG reset trigger\n");
 
@@ -2624,10 +2617,9 @@ void dcn10_enable_per_frame_crtc_position_reset(
        int group_size,
        struct pipe_ctx *grouped_pipes[])
 {
-       struct dc_context *dc_ctx = dc->ctx;
        int i;
 
-       DC_LOGGER_INIT(dc_ctx->logger);
+       DC_LOGGER_INIT(dc->ctx);
 
        DC_SYNC_INFO("Setting up\n");
        for (i = 0; i < group_size; i++)

diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c
index db2f7cbb12ff5ba9643b8f34760bd9ea3af8240f..94f63fd54e3eb9282b5b3bc07920d432fc801a79 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c
@@ -513,7 +513,6 @@ static void dcn31_reset_back_end_for_pipe(
 {
        struct dc_link *link;
 
-       DC_LOGGER_INIT(dc->ctx->logger);
        if (pipe_ctx->stream_res.stream_enc == NULL) {
                pipe_ctx->stream = NULL;
                return;

diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c
index b5a4cefbd35f242faad63d8c3b1185b5217bec88..b5f60f59382ea72b6c0e5d6c15b915f773161862 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c
@@ -60,15 +60,15 @@
 #include "dcn20/dcn20_hwseq.h"
 #include "dc_state_priv.h"
 
-#define DC_LOGGER_INIT(logger) \
-       struct dal_logger *dc_logger = logger
+#define DC_LOGGER \
+       dc_ctx->logger
+#define DC_LOGGER_INIT(ctx) \
+       struct dc_context *dc_ctx = ctx
 
 #define CTX \
        hws->ctx
 #define REG(reg)\
        hws->regs->reg
-#define DC_LOGGER \
-       dc_logger
 
 
 #undef FN
@@ -331,7 +331,7 @@ static void update_dsc_on_stream(struct pipe_ctx *pipe_ctx, bool enable)
        struct pipe_ctx *odm_pipe;
        int opp_cnt = 1;
 
-       DC_LOGGER_INIT(stream->ctx->logger);
+       DC_LOGGER_INIT(stream->ctx);
 
        ASSERT(dsc);
        for (odm_pipe = pipe_ctx->next_odm_pipe; odm_pipe; odm_pipe = odm_pipe->next_odm_pipe)
@@ -897,7 +897,7 @@ void dcn35_disable_plane(struct dc *dc, struct dc_state *state, struct pipe_ctx
        bool is_phantom = dc_state_get_pipe_subvp_type(state, pipe_ctx) == SUBVP_PHANTOM;
        struct timing_generator *tg = is_phantom ? pipe_ctx->stream_res.tg : NULL;
 
-       DC_LOGGER_INIT(dc->ctx->logger);
+       DC_LOGGER_INIT(dc->ctx);
 
        if (!pipe_ctx->plane_res.hubp || pipe_ctx->plane_res.hubp->power_gated)
                return;

diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c
index 69cc70106bf0759891dbd410d22c274bbab27f39..55c48c4bc6ce17ad10b6dcadd93bf8733f82aead 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c
@@ -1982,7 +1982,6 @@ void dcn401_reset_back_end_for_pipe(
        struct dc_link *link = pipe_ctx->stream->link;
        const struct link_hwss *link_hwss = get_link_hwss(link, &pipe_ctx->link_res);
 
-       DC_LOGGER_INIT(dc->ctx->logger);
        if (pipe_ctx->stream_res.stream_enc == NULL) {
                pipe_ctx->stream = NULL;
                return;
@@ -2422,8 +2421,6 @@ void dcn401_program_front_end_for_ctx(
        struct dce_hwseq *hws = dc->hwseq;
        struct pipe_ctx *pipe = NULL;
 
-       DC_LOGGER_INIT(dc->ctx->logger);
-
        if (resource_is_pipe_topology_changed(dc->current_state, context))
                resource_log_pipe_topology_update(dc, context);
 
@@ -2587,8 +2584,6 @@ void dcn401_post_unlock_program_front_end(
        struct dce_hwseq *hwseq = dc->hwseq;
        int i;
 
-       DC_LOGGER_INIT(dc->ctx->logger);
-
        for (i = 0; i < dc->res_pool->pipe_count; i++)
                if (resource_is_pipe_type(&dc->current_state->res_ctx.pipe_ctx[i], OPP_HEAD) &&
                        !resource_is_pipe_type(&context->res_ctx.pipe_ctx[i], OPP_HEAD))
@@ -2968,8 +2963,6 @@ void dcn401_plane_atomic_power_down(struct dc *dc,
        struct dce_hwseq *hws = dc->hwseq;
        uint32_t org_ip_request_cntl = 0;
 
-       DC_LOGGER_INIT(dc->ctx->logger);
-
        if (REG(DC_IP_REQUEST_CNTL)) {
                REG_GET(DC_IP_REQUEST_CNTL, IP_REQUEST_EN, &org_ip_request_cntl);
                if (org_ip_request_cntl == 0)
@@ -3061,8 +3054,6 @@ void dcn401_plane_atomic_power_down_sequence(struct dc *dc,
        struct dce_hwseq *hws = dc->hwseq;
        uint32_t org_ip_request_cntl = 0;
 
-       DC_LOGGER_INIT(dc->ctx->logger);
-
        /* Check and set DC_IP_REQUEST_CNTL if needed */
        if (REG(DC_IP_REQUEST_CNTL)) {
                REG_GET(DC_IP_REQUEST_CNTL, IP_REQUEST_EN, &org_ip_request_cntl);

diff --git a/drivers/gpu/drm/amd/display/dc/link/link_detection.c b/drivers/gpu/drm/amd/display/dc/link/link_detection.c
index d0bb26888f4b1edc74440406ec868c1fa1016c18..f992c2d167487c0c2eda2c7c19777124e9d27c7d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/link/link_detection.c
+++ b/drivers/gpu/drm/amd/display/dc/link/link_detection.c
@@ -352,7 +352,7 @@ static void query_dp_dual_mode_adaptor(
                        *dongle = DISPLAY_DONGLE_DP_DVI_DONGLE;
                        sink_cap->max_hdmi_pixel_clock = DP_ADAPTOR_DVI_MAX_TMDS_CLK;
 
-                       CONN_DATA_DETECT(ddc->link, type2_dongle_buf, sizeof(type2_dongle_buf),
+                       CONN_DATA_DETECT(link, type2_dongle_buf, sizeof(type2_dongle_buf),
                                        "DP-DVI passive dongle %dMhz: ",
                                        DP_ADAPTOR_DVI_MAX_TMDS_CLK / 1000);
                        return;
@@ -657,8 +657,6 @@ static bool wait_for_entering_dp_alt_mode(struct dc_link *link)
        unsigned long long time_taken_in_ns;
        int tries_taken;
 
-       DC_LOGGER_INIT(link->ctx->logger);
-
        /**
         * this function will only exist if we are on dcn21 (is_in_alt_mode is a
         *  function pointer, so checking to see if it is equal to 0 is the same
@@ -729,8 +727,6 @@ static void revert_dpia_mst_dsc_always_on_wa(struct dc_link *link)
 
 static bool discover_dp_mst_topology(struct dc_link *link, enum dc_detect_reason reason)
 {
-       DC_LOGGER_INIT(link->ctx->logger);
-
        LINK_INFO("link=%d, mst branch is now Connected\n",
                  link->link_index);
 
@@ -750,8 +746,6 @@ static bool discover_dp_mst_topology(struct dc_link *link, enum dc_detect_reason
 
 bool link_reset_cur_dp_mst_topology(struct dc_link *link)
 {
-       DC_LOGGER_INIT(link->ctx->logger);
-
        LINK_INFO("link=%d, mst branch is now Disconnected\n",
                  link->link_index);
 
@@ -977,8 +971,6 @@ static bool detect_link_and_local_sink(struct dc_link *link,
        enum dc_connection_type new_connection_type = dc_connection_none;
        const uint32_t post_oui_delay = 30; // 30ms
 
-       DC_LOGGER_INIT(link->ctx->logger);
-
        if (dc_is_virtual_signal(link->connector_signal))
                return false;
 
@@ -1459,8 +1451,6 @@ bool link_detect(struct dc_link *link, enum dc_detect_reason reason)
        bool is_delegated_to_mst_top_mgr = false;
        enum dc_connection_type pre_link_type = link->type;
 
-       DC_LOGGER_INIT(link->ctx->logger);
-
        is_local_sink_detect_success = detect_link_and_local_sink(link, reason);
 
        if (is_local_sink_detect_success && link->local_sink)

diff --git a/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c b/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c
index 5b2c1a4911cf0d542190b16a496d4ec667bfa021..ba311a8f3f654c633ecc6ca7cb22ba860afa83b0 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c
+++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c
@@ -1094,8 +1094,6 @@ bool edp_send_replay_cmd(struct dc_link *link,
        if (!replay)
                return false;
 
-       DC_LOGGER_INIT(link->ctx->logger);
-
        if (dp_pr_get_panel_inst(dc, link, &panel_inst))
                cmd_data->panel_inst = panel_inst;
        else {

diff --git a/drivers/gpu/drm/amd/display/dc/mpc/dcn10/dcn10_mpc.c b/drivers/gpu/drm/amd/display/dc/mpc/dcn10/dcn10_mpc.c
index b23c64004dd53f7fd9762778a895db171e78f15b..27e6532348509d7f2ba35c9cfc7fe07516a494c1 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/mpc/dcn10/dcn10_mpc.c
+++ b/drivers/gpu/drm/amd/display/dc/mpc/dcn10/dcn10_mpc.c
@@ -118,9 +118,7 @@ void mpc1_assert_idle_mpcc(struct mpc *mpc, int id)
 
 struct mpcc *mpc1_get_mpcc(struct mpc *mpc, int mpcc_id)
 {
-       struct dcn10_mpc *mpc10 = TO_DCN10_MPC(mpc);
-
-       ASSERT(mpcc_id < mpc10->num_mpcc);
+       ASSERT(mpcc_id < TO_DCN10_MPC(mpc)->num_mpcc);
        return &(mpc->mpcc_array[mpcc_id]);
 }
 

diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c
index 8b555187ac75374baa4b92ab2d2421b70dc6b5cc..366576b1c617c3aad8fae5af029746f367108944 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c
@@ -2341,8 +2341,6 @@ static bool init_soc_bounding_box(struct dc *dc,
        struct _vcs_dpi_ip_params_st *loaded_ip =
                        get_asic_rev_ip_params(dc->ctx->asic_id.hw_internal_rev);
 
-       DC_LOGGER_INIT(dc->ctx->logger);
-
        if (pool->base.pp_smu) {
                struct pp_smu_nv_clock_table max_clocks = {0};
                unsigned int uclk_states[8] = {0};