From 4767f26f04a8060e283fbd0df7506b9b19a2c355 Mon Sep 17 00:00:00 2001 From: Devarsh Thakkar Date: Wed, 7 Mar 2018 23:37:24 -0800 Subject: [PATCH] v4l2-core: Update entries for XV15 and XV20 contiguous formats This patch adds missing entries XV20 and XV15 contiguous formats and fix the warning as format description size is going beyond 32 byte limit. Signed-off-by: Devarsh Thakkar Signed-off-by: Satish Kumar Nagireddy Reviewed-by: Hyun Kwon Signed-off-by: Michal Simek --- drivers/media/v4l2-core/v4l2-ioctl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 584d2985c605..bde85ebe1f01 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1181,14 +1181,16 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) case V4L2_PIX_FMT_NV61: descr = "Y/CrCb 4:2:2"; break; case V4L2_PIX_FMT_NV24: descr = "Y/CbCr 4:4:4"; break; case V4L2_PIX_FMT_NV42: descr = "Y/CrCb 4:4:4"; break; - case V4L2_PIX_FMT_XV20: descr = "Y/CrCb 4:2:2 10-bit w/padding"; break; - case V4L2_PIX_FMT_XV15: descr = "Y/CrCb 4:2:0 10-bit w/padding"; break; + case V4L2_PIX_FMT_XV15: descr = "Y/CrCb 4:2:0 10-bit"; break; + case V4L2_PIX_FMT_XV20: descr = "Y/CrCb 4:2:2 10-bit"; break; case V4L2_PIX_FMT_NV12M: descr = "Y/CbCr 4:2:0 (N-C)"; break; case V4L2_PIX_FMT_NV21M: descr = "Y/CrCb 4:2:0 (N-C)"; break; case V4L2_PIX_FMT_NV16M: descr = "Y/CbCr 4:2:2 (N-C)"; break; case V4L2_PIX_FMT_NV61M: descr = "Y/CrCb 4:2:2 (N-C)"; break; case V4L2_PIX_FMT_NV12MT: descr = "Y/CbCr 4:2:0 (64x32 MB, N-C)"; break; case V4L2_PIX_FMT_NV12MT_16X16: descr = "Y/CbCr 4:2:0 (16x16 MB, N-C)"; break; + case V4L2_PIX_FMT_XV20M: descr = "Y/CrCb 4:2:2 10-bit (N-C)"; break; + case V4L2_PIX_FMT_XV15M: descr = "Y/CrCb 4:2:0 10-bit (N-C)"; break; case V4L2_PIX_FMT_YUV420M: descr = "Planar YUV 4:2:0 (N-C)"; break; case V4L2_PIX_FMT_YVU420M: descr = "Planar YVU 4:2:0 (N-C)"; break; case V4L2_PIX_FMT_YUV422M: descr = "Planar YUV 4:2:2 (N-C)"; break; -- 2.39.2