| Message ID | 6cb8efcadcf8c856efb32b7692fc9bf3241e3bc3.1627588010.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | media: meson-ge2d: Fix rotation parameter changes detection in 'ge2d_s_ctrl()' | expand |
Hi, On 29/07/2021 21:49, Christophe JAILLET wrote: > There is likely a typo here. To be consistent, we should compare > 'fmt.height' with 'ctx->out.pix_fmt.height', not 'ctx->out.pix_fmt.width'. You're right, it's typo. > > Fixes: 59a635327ca7 ("media: meson: Add M2M driver for the Amlogic GE2D Accelerator Unit") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > I've not looked deeply in the code, but why is this test needed in the > first place? > Couldn't we assigned 'ctx->out.pix_fmt = fmt' un-conditionally? We could indeed, and with the typo you discovered it's already the case so the test could go away. > --- > drivers/media/platform/meson/ge2d/ge2d.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/media/platform/meson/ge2d/ge2d.c b/drivers/media/platform/meson/ge2d/ge2d.c > index a1393fefa8ae..be22bb60e7cf 100644 > --- a/drivers/media/platform/meson/ge2d/ge2d.c > +++ b/drivers/media/platform/meson/ge2d/ge2d.c > @@ -780,7 +780,7 @@ static int ge2d_s_ctrl(struct v4l2_ctrl *ctrl) > * parameters, take them in account > */ > if (fmt.width != ctx->out.pix_fmt.width || > - fmt.height != ctx->out.pix_fmt.width || > + fmt.height != ctx->out.pix_fmt.height || > fmt.bytesperline > ctx->out.pix_fmt.bytesperline || > fmt.sizeimage > ctx->out.pix_fmt.sizeimage) > ctx->out.pix_fmt = fmt; > Acked-by: Neil Armstrong <narmstrong@baylibre.com> (please keep it if you re-spin by removing the test entirely) Neil
diff --git a/drivers/media/platform/meson/ge2d/ge2d.c b/drivers/media/platform/meson/ge2d/ge2d.c index a1393fefa8ae..be22bb60e7cf 100644 --- a/drivers/media/platform/meson/ge2d/ge2d.c +++ b/drivers/media/platform/meson/ge2d/ge2d.c @@ -780,7 +780,7 @@ static int ge2d_s_ctrl(struct v4l2_ctrl *ctrl) * parameters, take them in account */ if (fmt.width != ctx->out.pix_fmt.width || - fmt.height != ctx->out.pix_fmt.width || + fmt.height != ctx->out.pix_fmt.height || fmt.bytesperline > ctx->out.pix_fmt.bytesperline || fmt.sizeimage > ctx->out.pix_fmt.sizeimage) ctx->out.pix_fmt = fmt;
There is likely a typo here. To be consistent, we should compare 'fmt.height' with 'ctx->out.pix_fmt.height', not 'ctx->out.pix_fmt.width'. Fixes: 59a635327ca7 ("media: meson: Add M2M driver for the Amlogic GE2D Accelerator Unit") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- I've not looked deeply in the code, but why is this test needed in the first place? Couldn't we assigned 'ctx->out.pix_fmt = fmt' un-conditionally? --- drivers/media/platform/meson/ge2d/ge2d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)