]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: meson-ge2d: fix rotation parameters
authorNeil Armstrong <narmstrong@baylibre.com>
Mon, 12 Apr 2021 13:48:33 +0000 (15:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 May 2021 08:49:58 +0000 (10:49 +0200)
[ Upstream commit 87e780db2253a1759822c2c9ea207135fcc059de ]

With these settings, 90deg and 270deg rotation leads to inverted
vertical, fix them to have correct rotation.

Fixes: 59a635327ca7 ("media: meson: Add M2M driver for the Amlogic GE2D Accelerator Unit")
Signed-off-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>
drivers/media/platform/meson/ge2d/ge2d.c

index f526501bd473b69d8f442607b4afe0f4ad86fcd6..4ca71eeb26d6f9beb251e642d8c377be981b57ee 100644 (file)
@@ -757,7 +757,7 @@ static int ge2d_s_ctrl(struct v4l2_ctrl *ctrl)
 
                if (ctrl->val == 90) {
                        ctx->hflip = 0;
-                       ctx->vflip = 0;
+                       ctx->vflip = 1;
                        ctx->xy_swap = 1;
                } else if (ctrl->val == 180) {
                        ctx->hflip = 1;
@@ -765,7 +765,7 @@ static int ge2d_s_ctrl(struct v4l2_ctrl *ctrl)
                        ctx->xy_swap = 0;
                } else if (ctrl->val == 270) {
                        ctx->hflip = 1;
-                       ctx->vflip = 1;
+                       ctx->vflip = 0;
                        ctx->xy_swap = 1;
                } else {
                        ctx->hflip = 0;