* [PATCH][next] drm/amd/display: fix for-loop with incorrectly sized loop counter
@ 2020-01-17 13:33 Colin King
2020-01-17 14:26 ` walter harms
0 siblings, 1 reply; 3+ messages in thread
From: Colin King @ 2020-01-17 13:33 UTC (permalink / raw)
To: Harry Wentland, Leo Li, Alex Deucher, Christian König,
David Zhou, David Airlie, Daniel Vetter, Rodrigo Siqueira,
Nikola Cornij, Wenjing Liu, amd-gfx, dri-devel
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
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.
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>
---
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index 6ab298c65247..cbed738a4246 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -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,12 @@ 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);
+ }
}
}
break;
--
2.24.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH][next] drm/amd/display: fix for-loop with incorrectly sized loop counter
2020-01-17 13:33 [PATCH][next] drm/amd/display: fix for-loop with incorrectly sized loop counter Colin King
@ 2020-01-17 14:26 ` walter harms
2020-01-27 20:13 ` Alex Deucher
0 siblings, 1 reply; 3+ messages in thread
From: walter harms @ 2020-01-17 14:26 UTC (permalink / raw)
To: Colin King
Cc: Harry Wentland, Leo Li, Alex Deucher, Christian König,
David Zhou, David Airlie, Daniel Vetter, Rodrigo Siqueira,
Nikola Cornij, Wenjing Liu, amd-gfx, dri-devel, kernel-janitors,
linux-kernel
Am 17.01.2020 14:33, schrieb Colin King:
> From: Colin Ian King <colin.king@canonical.com>
>
> 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.
>
> 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>
> ---
> drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> index 6ab298c65247..cbed738a4246 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> @@ -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,12 @@ 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);
> + }
> }
> }
> break;
Nitpick:
the else is useless you can remove it.
re,
wh
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][next] drm/amd/display: fix for-loop with incorrectly sized loop counter
2020-01-17 14:26 ` walter harms
@ 2020-01-27 20:13 ` Alex Deucher
0 siblings, 0 replies; 3+ messages in thread
From: Alex Deucher @ 2020-01-27 20:13 UTC (permalink / raw)
To: walter harms
Cc: Colin King, kernel-janitors, Leo Li, Wenjing Liu,
Rodrigo Siqueira, LKML, amd-gfx list, Nikola Cornij,
David Airlie, Maling list - DRI developers, Alex Deucher,
Christian König
Applied with Walter's comment included.
Thanks!
Alex
On Fri, Jan 17, 2020 at 9:45 AM walter harms <wharms@bfs.de> wrote:
>
>
>
> Am 17.01.2020 14:33, schrieb Colin King:
> > From: Colin Ian King <colin.king@canonical.com>
> >
> > 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.
> >
> > 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>
> > ---
> > drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 5 +++--
> > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> > index 6ab298c65247..cbed738a4246 100644
> > --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> > +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
> > @@ -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,12 @@ 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);
> > + }
> > }
> > }
> > break;
>
> Nitpick:
> the else is useless you can remove it.
>
> re,
> wh
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-27 20:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-17 13:33 [PATCH][next] drm/amd/display: fix for-loop with incorrectly sized loop counter Colin King
2020-01-17 14:26 ` walter harms
2020-01-27 20:13 ` Alex Deucher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).