media: ti-vpe: csc: fix single vs multiplanar format handling

In csc_set_coeff() we were previously checking if the format type was
V4L2_BUF_TYPE_VIDEO_OUTPUT or V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE as a
mean to figure out if the format was multiplanar or not. This was not
entirely accurate as the format type could also be a CAPTURE type
instead.

Fix this by removing the 'switch' construct and replacing them with
"if (V4L2_TYPE_IS_MULTIPLANAR(type))" instead.

Signed-off-by: Benoit Parrot <bparrot@ti.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/ti-vpe/csc.c b/drivers/media/platform/ti-vpe/csc.c
index 834114a4eebe166230d7abc47cd3db26706aa49a..f4e0cf72d1cf293af7f212e379b6f47d28a0c99b 100644 (file)
--- a/drivers/media/platform/ti-vpe/csc.c
+++ b/drivers/media/platform/ti-vpe/csc.c
@@ -149,36 +149,28 @@ void csc_set_coeff(struct csc_data *csc, u32 *csc_reg0,
        enum v4l2_quantization src_quantization, dst_quantization;
        u32 src_pixelformat, dst_pixelformat;
 
-       switch (src_fmt->type) {
-       case V4L2_BUF_TYPE_VIDEO_OUTPUT:
-               pix = &src_fmt->fmt.pix;
-               src_pixelformat = pix->pixelformat;
-               src_ycbcr_enc = pix->ycbcr_enc;
-               src_quantization = pix->quantization;
-               break;
-       case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
-       default:
+       if (V4L2_TYPE_IS_MULTIPLANAR(src_fmt->type)) {
                mp = &src_fmt->fmt.pix_mp;
                src_pixelformat = mp->pixelformat;
                src_ycbcr_enc = mp->ycbcr_enc;
                src_quantization = mp->quantization;
-               break;
+       } else {
+               pix = &src_fmt->fmt.pix;
+               src_pixelformat = pix->pixelformat;
+               src_ycbcr_enc = pix->ycbcr_enc;
+               src_quantization = pix->quantization;
        }
 
-       switch (dst_fmt->type) {
-       case V4L2_BUF_TYPE_VIDEO_OUTPUT:
-               pix = &dst_fmt->fmt.pix;
-               dst_pixelformat = pix->pixelformat;
-               dst_ycbcr_enc = pix->ycbcr_enc;
-               dst_quantization = pix->quantization;
-               break;
-       case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
-       default:
+       if (V4L2_TYPE_IS_MULTIPLANAR(dst_fmt->type)) {
                mp = &dst_fmt->fmt.pix_mp;
                dst_pixelformat = mp->pixelformat;
                dst_ycbcr_enc = mp->ycbcr_enc;
                dst_quantization = mp->quantization;
-               break;
+       } else {
+               pix = &dst_fmt->fmt.pix;
+               dst_pixelformat = pix->pixelformat;
+               dst_ycbcr_enc = pix->ycbcr_enc;
+               dst_quantization = pix->quantization;
        }
 
        src_finfo = v4l2_format_info(src_pixelformat);