]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/amd/display: dc_link: code clean up on enable_link_dp function
authorMelissa Wen <melissa.srw@gmail.com>
Fri, 28 Feb 2020 16:41:45 +0000 (13:41 -0300)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 5 Mar 2020 05:27:18 +0000 (00:27 -0500)
Coding style clean up on enable_link_dp function as suggested by
checkpatch.pl:

CHECK: Lines should not end with a '('
WARNING: line over 80 characters
WARNING: suspect code indent for conditional statements (8, 24)
CHECK: braces {} should be used on all arms of this statement
ERROR: else should follow close brace '}'
CHECK: Comparison to NULL could be written
       "link->preferred_training_settings.fec_enable"

Signed-off-by: Melissa Wen <melissa.srw@gmail.com>
Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/core/dc_link.c

index 02e1ad3182035f60822b5313e6e2302a8e29b6a5..eb9894e416ed00c1c7b5a3af96a75583898adfd9 100644 (file)
@@ -1498,9 +1498,8 @@ static void enable_stream_features(struct pipe_ctx *pipe_ctx)
        }
 }
 
-static enum dc_status enable_link_dp(
-               struct dc_state *state,
-               struct pipe_ctx *pipe_ctx)
+static enum dc_status enable_link_dp(struct dc_state *state,
+                                    struct pipe_ctx *pipe_ctx)
 {
        struct dc_stream_state *stream = pipe_ctx->stream;
        enum dc_status status;
@@ -1532,7 +1531,8 @@ static enum dc_status enable_link_dp(
        pipe_ctx->stream_res.pix_clk_params.requested_sym_clk =
                        link_settings.link_rate * LINK_RATE_REF_FREQ_IN_KHZ;
        if (state->clk_mgr && !apply_seamless_boot_optimization)
-               state->clk_mgr->funcs->update_clocks(state->clk_mgr, state, false);
+               state->clk_mgr->funcs->update_clocks(state->clk_mgr,
+                                                    state, false);
 
        // during mode switch we do DP_SET_POWER off then on, and OUI is lost
        dpcd_set_source_specific_data(link);
@@ -1540,21 +1540,20 @@ static enum dc_status enable_link_dp(
        skip_video_pattern = true;
 
        if (link_settings.link_rate == LINK_RATE_LOW)
-                       skip_video_pattern = false;
-
-       if (perform_link_training_with_retries(
-                       &link_settings,
-                       skip_video_pattern,
-                       LINK_TRAINING_ATTEMPTS,
-                       pipe_ctx,
-                       pipe_ctx->stream->signal)) {
+               skip_video_pattern = false;
+
+       if (perform_link_training_with_retries(&link_settings,
+                                              skip_video_pattern,
+                                              LINK_TRAINING_ATTEMPTS,
+                                              pipe_ctx,
+                                              pipe_ctx->stream->signal)) {
                link->cur_link_settings = link_settings;
                status = DC_OK;
-       }
-       else
+       } else {
                status = DC_FAIL_DP_LINK_TRAINING;
+       }
 
-       if (link->preferred_training_settings.fec_enable != NULL)
+       if (link->preferred_training_settings.fec_enable)
                fec_enable = *link->preferred_training_settings.fec_enable;
        else
                fec_enable = true;