[PATCH 4/4] media: rockchip: rga: Only set output CSC mode for RGB input

Paul Kocialkowski
2020-04-16T11:56:21Z

Setting the output CSC mode is required for a YUV output, but must not
be set when the input is also YUV. Doing this (as tested with a YUV420P
to YUV420P conversion) results in wrong colors.

Adapt the logic to only set the CSC mode when the output is YUV and the
input is RGB.

Fixes: f7e7b48e6d79 ("[media] rockchip/rga: v4l2 m2m support")
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
---
drivers/media/platform/rockchip/rga/rga-hw.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/media/platform/rockchip/rga/rga-hw.c b/drivers/media/platform/rockchip/rga/rga-hw.c
index 4be6dcf292ff..cbffcf986ccf 100644
--- a/drivers/media/platform/rockchip/rga/rga-hw.c
+++ b/drivers/media/platform/rockchip/rga/rga-hw.c
@@ -216,13 +216,17 @@ static void rga_cmd_set_trans_info(struct rga_ctx *ctx)
}

if (ctx->out.fmt->hw_format >= RGA_COLOR_FMT_YUV422SP) {
- switch (ctx->out.colorspace) {
- case V4L2_COLORSPACE_REC709:
- dst_info.data.csc_mode = RGA_SRC_CSC_MODE_BT709_R0;
- break;
- default:
- dst_info.data.csc_mode = RGA_DST_CSC_MODE_BT601_R0;
- break;
+ if (ctx->in.fmt->hw_format < RGA_COLOR_FMT_YUV422SP) {
+ switch (ctx->out.colorspace) {
+ case V4L2_COLORSPACE_REC709:
+ dst_info.data.csc_mode =
+ RGA_SRC_CSC_MODE_BT709_R0;
+ break;
+ default:
+ dst_info.data.csc_mode =
+ RGA_DST_CSC_MODE_BT601_R0;
+ break;
+ }
}
}

--
2.26.0