Messages in this thread | | | Subject | Re: [PATCH v2 4/4] media: rockchip: rga: Only set output CSC mode for RGB input | From | Ezequiel Garcia <> | Date | Sat, 25 Apr 2020 10:46:47 -0300 |
| |
Hi Paul,
Thanks a lot for the patch.
I haven't had the chance to test this, but I'd say you are fixing a long time issue here.
I really appreciate that.
On Thu, 2020-04-23 at 22:09 +0200, Paul Kocialkowski wrote: > 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) {
Since we are already here touching this code, would you mind adding another patch, to do some cleaning first?
First, replace the nested ifs with a boolean operator. Then, introduce some IS_YUV (or IS_RGB) macro, making the above test more like IS_YUV(out_hw_format).
Finally, perhaps a comment along the lines of your commit message:
""" Setting the output CSC mode is required for a YUV output, but must not be set when the input is also YUV. """
Details up to you :-)
After the clean-up patch, which would be just cosmetics, your fix should be cleaner and more clear.
Thanks, Ezequiel
> - 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; > + } > } > } >
| |