]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
drm/amd/display: fix for-loop with incorrectly sized loop counter (v2)
authorColin Ian King <colin.king@canonical.com>
Fri, 17 Jan 2020 13:33:05 +0000 (13:33 +0000)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 27 Jan 2020 21:46:45 +0000 (16:46 -0500)
A for-loop is iterating from 0 up to 1000 however the loop variable count
is a u8 and hence not large enough.  Fix this by making count an int.
Also remove the redundant initialization of count since this is never used
and add { } on the loop statement make the loop block clearer.

v2: drop useless else (Walter Harms)

Addresses-Coverity: ("Operands don't affect result")
Fixes: ed581a0ace44 ("drm/amd/display: wait for update when setting dpg test pattern")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c

index a53e8fed56f39fb3b81c333ef167186d8de04563..cb731c1d30b1000b4624f12a7e495e2946aded47 100644 (file)
@@ -3680,7 +3680,7 @@ static void set_crtc_test_pattern(struct dc_link *link,
                        struct pipe_ctx *odm_pipe;
                        enum controller_dp_color_space controller_color_space;
                        int opp_cnt = 1;
-                       uint8_t count = 0;
+                       int count;
 
                        switch (test_pattern_color_space) {
                        case DP_TEST_PATTERN_COLOR_SPACE_RGB:
@@ -3725,11 +3725,11 @@ static void set_crtc_test_pattern(struct dc_link *link,
                                width,
                                height);
                        /* wait for dpg to blank pixel data with test pattern */
-                       for (count = 0; count < 1000; count++)
+                       for (count = 0; count < 1000; count++) {
                                if (opp->funcs->dpg_is_blanked(opp))
                                        break;
-                               else
-                                       udelay(100);
+                               udelay(100);
+                       }
                }
        }
        break;