media: rockchip: rga: fix swizzling for RGB formats

[ Upstream commit 9e7dc39260edac180c206bb6149595a40eabae3e ]

When using 32 bit RGB formats, the RGA on the rk3568 produces wrong
colors as the wrong color channels are read or written.  The reason is
that the format description for the channel swizzeling is wrong and the
wrong bits are configured. For example, when converting ARGB32 to NV12,
the alpha channel is used as blue channel.. This doesn't happen if the
color format is the same on both sides.

Fix the color_swap settings of the formats to correctly handle 32 bit
RGB formats.

For RGA_COLOR_FMT_XBGR8888, the RGA_COLOR_ALPHA_SWAP bit doesn't have an
effect. Thus, it isn't possible to handle the V4L2_PIX_FMT_XRGB32. Thus,
it is removed from the list of supported formats.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index f1c532a5802ac29673904522eeeb92fa1341bb7a..25f5b5eebf13ff6f1a05937ed7742116459f826c 100644 (file)
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -184,25 +184,16 @@ static int rga_setup_ctrls(struct rga_ctx *ctx)
 static struct rga_fmt formats[] = {
        {
                .fourcc = V4L2_PIX_FMT_ARGB32,
-               .color_swap = RGA_COLOR_RB_SWAP,
+               .color_swap = RGA_COLOR_ALPHA_SWAP,
                .hw_format = RGA_COLOR_FMT_ABGR8888,
                .depth = 32,
                .uv_factor = 1,
                .y_div = 1,
                .x_div = 1,
        },
-       {
-               .fourcc = V4L2_PIX_FMT_XRGB32,
-               .color_swap = RGA_COLOR_RB_SWAP,
-               .hw_format = RGA_COLOR_FMT_XBGR8888,
-               .depth = 32,
-               .uv_factor = 1,
-               .y_div = 1,
-               .x_div = 1,
-       },
        {
                .fourcc = V4L2_PIX_FMT_ABGR32,
-               .color_swap = RGA_COLOR_ALPHA_SWAP,
+               .color_swap = RGA_COLOR_RB_SWAP,
                .hw_format = RGA_COLOR_FMT_ABGR8888,
                .depth = 32,
                .uv_factor = 1,
@@ -211,7 +202,7 @@ static struct rga_fmt formats[] = {
        },
        {
                .fourcc = V4L2_PIX_FMT_XBGR32,
-               .color_swap = RGA_COLOR_ALPHA_SWAP,
+               .color_swap = RGA_COLOR_RB_SWAP,
                .hw_format = RGA_COLOR_FMT_XBGR8888,
                .depth = 32,
                .uv_factor = 1,