media: meson-ge2d: Fix rotation parameter changes detection in 'ge2d_s_ctrl()'

BugLink: https://bugs.launchpad.net/bugs/1951822
[ Upstream commit 4b9e3e8af4b336eefca1f1ee535bc4b6734ed6aa ]

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'.

Instead of fixing the test, just remove it and copy 'fmt' unconditionally.

Fixes: 59a635327ca7 ("media: meson: Add M2M driver for the Amlogic GE2D Accelerator Unit")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/drivers/media/platform/meson/ge2d/ge2d.c b/drivers/media/platform/meson/ge2d/ge2d.c
index a1393fefa8aeab90c8a8a7f47c040c57931330e3..9b1e973e78da3a677022609ce2f2d20bc91b1e16 100644 (file)
--- a/drivers/media/platform/meson/ge2d/ge2d.c
+++ b/drivers/media/platform/meson/ge2d/ge2d.c
@@ -779,11 +779,7 @@ static int ge2d_s_ctrl(struct v4l2_ctrl *ctrl)
                 * If the rotation parameter changes the OUTPUT frames
                 * parameters, take them in account
                 */
-               if (fmt.width != ctx->out.pix_fmt.width ||
-                   fmt.height != ctx->out.pix_fmt.width ||
-                   fmt.bytesperline > ctx->out.pix_fmt.bytesperline ||
-                   fmt.sizeimage > ctx->out.pix_fmt.sizeimage)
-                       ctx->out.pix_fmt = fmt;
+               ctx->out.pix_fmt = fmt;
 
                break;
        }