OSDN Git Service

drm/amd/display: Remove unnecessary NULL check in set_preferred_link_settings
authorHarry Wentland <harry.wentland@amd.com>
Fri, 31 May 2019 18:17:43 +0000 (14:17 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 18 Jul 2019 19:18:10 +0000 (14:18 -0500)
[Why]
link_stream is never NULL here as we've dereferenced it a couple lines before
and have done so for a couple months now.

[How]
- Drop the NULL check.
- Initialize where we know link_stream is non-NULL

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/core/dc_link.c

index 5852dd5..595f2a3 100644 (file)
@@ -3023,8 +3023,10 @@ void dc_link_set_preferred_link_settings(struct dc *dc,
        for (i = 0; i < MAX_PIPES; i++) {
                pipe = &dc->current_state->res_ctx.pipe_ctx[i];
                if (pipe->stream && pipe->stream->link) {
-                       if (pipe->stream->link == link)
+                       if (pipe->stream->link == link) {
+                               link_stream = pipe->stream;
                                break;
+                       }
                }
        }
 
@@ -3032,14 +3034,11 @@ void dc_link_set_preferred_link_settings(struct dc *dc,
        if (i == MAX_PIPES)
                return;
 
-       link_stream = link->dc->current_state->res_ctx.pipe_ctx[i].stream;
-
        /* Cannot retrain link if backend is off */
        if (link_stream->dpms_off)
                return;
 
-       if (link_stream)
-               decide_link_settings(link_stream, &store_settings);
+       decide_link_settings(link_stream, &store_settings);
 
        if ((store_settings.lane_count != LANE_COUNT_UNKNOWN) &&
                (store_settings.link_rate != LINK_RATE_UNKNOWN))