* [PATCH] media: davinci: Fix implicit enum conversion warning
@ 2018-09-15 6:16 Nathan Chancellor
2018-09-17 17:39 ` Nick Desaulniers
0 siblings, 1 reply; 3+ messages in thread
From: Nathan Chancellor @ 2018-09-15 6:16 UTC (permalink / raw)
To: Lad, Prabhakar, Mauro Carvalho Chehab
Cc: linux-media, linux-kernel, Nick Desaulniers, Nathan Chancellor
Clang warns when one enumerated type is implicitly converted to another.
drivers/media/platform/davinci/vpbe_display.c:524:24: warning: implicit
conversion from enumeration type 'enum osd_v_exp_ratio' to different
enumeration type 'enum osd_h_exp_ratio' [-Wenum-conversion]
layer_info->h_exp = V_EXP_6_OVER_5;
~ ^~~~~~~~~~~~~~
1 warning generated.
This appears to be a copy and paste error judging from the couple of
lines directly above this statement and the way that height is handled
in the if block above this one.
Reported-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
drivers/media/platform/davinci/vpbe_display.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index d6bf96ad474c..5c235898af7b 100644
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -521,7 +521,7 @@ vpbe_disp_calculate_scale_factor(struct vpbe_display *disp_dev,
else if (v_scale == 4)
layer_info->v_zoom = ZOOM_X4;
if (v_exp)
- layer_info->h_exp = V_EXP_6_OVER_5;
+ layer_info->v_exp = V_EXP_6_OVER_5;
} else {
/* no scaling, only cropping. Set display area to crop area */
cfg->ysize = expected_ysize;
--
2.18.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] media: davinci: Fix implicit enum conversion warning
2018-09-15 6:16 [PATCH] media: davinci: Fix implicit enum conversion warning Nathan Chancellor
@ 2018-09-17 17:39 ` Nick Desaulniers
2018-09-19 19:03 ` Nathan Chancellor
0 siblings, 1 reply; 3+ messages in thread
From: Nick Desaulniers @ 2018-09-17 17:39 UTC (permalink / raw)
To: Nathan Chancellor
Cc: prabhakar.csengg, Mauro Carvalho Chehab, linux-media, LKML
On Fri, Sep 14, 2018 at 11:16 PM Nathan Chancellor
<natechancellor@gmail.com> wrote:
>
> Clang warns when one enumerated type is implicitly converted to another.
>
> drivers/media/platform/davinci/vpbe_display.c:524:24: warning: implicit
> conversion from enumeration type 'enum osd_v_exp_ratio' to different
> enumeration type 'enum osd_h_exp_ratio' [-Wenum-conversion]
> layer_info->h_exp = V_EXP_6_OVER_5;
> ~ ^~~~~~~~~~~~~~
> 1 warning generated.
>
> This appears to be a copy and paste error judging from the couple of
> lines directly above this statement and the way that height is handled
> in the if block above this one.
The above code for reference looks like:
492 if (h_exp)
493 layer_info->h_exp = H_EXP_9_OVER_8;
so it makes sense to me that:
if (h_exp) layer_info->h_exp = H_EXP_...;
then
if (v_exp) layer_info->v_exp = V_EXP_...;
Thanks for this patch Nathan, looks like an actual bug has been fixed.
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
We should send this to stable if/when it lands. Maybe the maintainers
could apply it with:
Cc: stable@vger.kernel.org
>
> Reported-by: Nick Desaulniers <ndesaulniers@google.com>
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
> ---
> drivers/media/platform/davinci/vpbe_display.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
> index d6bf96ad474c..5c235898af7b 100644
> --- a/drivers/media/platform/davinci/vpbe_display.c
> +++ b/drivers/media/platform/davinci/vpbe_display.c
> @@ -521,7 +521,7 @@ vpbe_disp_calculate_scale_factor(struct vpbe_display *disp_dev,
> else if (v_scale == 4)
> layer_info->v_zoom = ZOOM_X4;
> if (v_exp)
> - layer_info->h_exp = V_EXP_6_OVER_5;
> + layer_info->v_exp = V_EXP_6_OVER_5;
> } else {
> /* no scaling, only cropping. Set display area to crop area */
> cfg->ysize = expected_ysize;
> --
> 2.18.0
>
--
Thanks,
~Nick Desaulniers
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] media: davinci: Fix implicit enum conversion warning
2018-09-17 17:39 ` Nick Desaulniers
@ 2018-09-19 19:03 ` Nathan Chancellor
0 siblings, 0 replies; 3+ messages in thread
From: Nathan Chancellor @ 2018-09-19 19:03 UTC (permalink / raw)
To: Nick Desaulniers
Cc: prabhakar.csengg, Mauro Carvalho Chehab, linux-media, LKML
On Mon, Sep 17, 2018 at 10:39:05AM -0700, Nick Desaulniers wrote:
> On Fri, Sep 14, 2018 at 11:16 PM Nathan Chancellor
> <natechancellor@gmail.com> wrote:
> >
> > Clang warns when one enumerated type is implicitly converted to another.
> >
> > drivers/media/platform/davinci/vpbe_display.c:524:24: warning: implicit
> > conversion from enumeration type 'enum osd_v_exp_ratio' to different
> > enumeration type 'enum osd_h_exp_ratio' [-Wenum-conversion]
> > layer_info->h_exp = V_EXP_6_OVER_5;
> > ~ ^~~~~~~~~~~~~~
> > 1 warning generated.
> >
> > This appears to be a copy and paste error judging from the couple of
> > lines directly above this statement and the way that height is handled
> > in the if block above this one.
>
>
> The above code for reference looks like:
> 492 if (h_exp)
> 493 layer_info->h_exp = H_EXP_9_OVER_8;
>
> so it makes sense to me that:
> if (h_exp) layer_info->h_exp = H_EXP_...;
> then
> if (v_exp) layer_info->v_exp = V_EXP_...;
>
> Thanks for this patch Nathan, looks like an actual bug has been fixed.
> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
>
> We should send this to stable if/when it lands. Maybe the maintainers
> could apply it with:
> Cc: stable@vger.kernel.org
>
Yes, I think this qualifies as stable material. Should I need to send a
v2, I will add it; otherwise, it can be added by the maintainers at
their discretion.
Thanks for the review!
Nathan
>
> >
> > Reported-by: Nick Desaulniers <ndesaulniers@google.com>
> > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
> > ---
> > drivers/media/platform/davinci/vpbe_display.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
> > index d6bf96ad474c..5c235898af7b 100644
> > --- a/drivers/media/platform/davinci/vpbe_display.c
> > +++ b/drivers/media/platform/davinci/vpbe_display.c
> > @@ -521,7 +521,7 @@ vpbe_disp_calculate_scale_factor(struct vpbe_display *disp_dev,
> > else if (v_scale == 4)
> > layer_info->v_zoom = ZOOM_X4;
> > if (v_exp)
> > - layer_info->h_exp = V_EXP_6_OVER_5;
> > + layer_info->v_exp = V_EXP_6_OVER_5;
> > } else {
> > /* no scaling, only cropping. Set display area to crop area */
> > cfg->ysize = expected_ysize;
> > --
> > 2.18.0
> >
>
>
> --
> Thanks,
> ~Nick Desaulniers
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-09-19 19:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-15 6:16 [PATCH] media: davinci: Fix implicit enum conversion warning Nathan Chancellor
2018-09-17 17:39 ` Nick Desaulniers
2018-09-19 19:03 ` Nathan Chancellor
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).