From 269ba02f63b3e2f2e3d448fa6b6f86dae06ecc9b Mon Sep 17 00:00:00 2001 From: "J. Avila" Date: Wed, 29 Apr 2020 22:36:45 +0000 Subject: [PATCH] ANDROID: GKI: Add support for missing V4L2 symbols Adds support for the below #defines to fix some warnings: V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010_VENUS V4L2_PIX_FMT_NV12_512 V4L2_PIX_FMT_NV12_UBWC V4L2_PIX_FMT_NV12_TP10_UBWC Bug: 155434217 [elavila snapshot of required #defines from e8507af28b12f] Signed-off-by: J. Avila Change-Id: Icba92ff8dfad59a9d84d2fa676dffbca1f56053d --- drivers/media/v4l2-core/v4l2-ioctl.c | 8 ++++++++ include/uapi/linux/videodev2.h | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 7c80d9b38d60..eadf673c442c 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1295,6 +1295,14 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) case V4L2_META_FMT_VSP1_HGO: descr = "R-Car VSP1 1-D Histogram"; break; case V4L2_META_FMT_VSP1_HGT: descr = "R-Car VSP1 2-D Histogram"; break; case V4L2_META_FMT_UVC: descr = "UVC payload header metadata"; break; + case V4L2_PIX_FMT_NV12_UBWC: + descr = "NV12 UBWC"; break; + case V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010_VENUS: + descr = "Y/CbCr 4:2:0 P10 Venus"; break; + case V4L2_PIX_FMT_NV12_TP10_UBWC: + descr = "Y/CbCr 4:2:0 TP10 UBWC"; break; + case V4L2_PIX_FMT_NV12_512: + descr = "Y/CbCr 4:2:0 (512 align)"; break; default: /* Compressed formats */ diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index d65078e7df5e..f4742d0ffdeb 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -564,6 +564,14 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_NV24 v4l2_fourcc('N', 'V', '2', '4') /* 24 Y/CbCr 4:4:4 */ #define V4L2_PIX_FMT_NV42 v4l2_fourcc('N', 'V', '4', '2') /* 24 Y/CrCb 4:4:4 */ +/* NV12_512 8-bit Y/CbCr 4:2:0 */ +#define V4L2_PIX_FMT_NV12_512 v4l2_fourcc('Q', '5', '1', '2') + +/* UBWC 8-bit Y/CbCr 4:2:0 */ +#define V4L2_PIX_FMT_NV12_UBWC v4l2_fourcc('Q', '1', '2', '8') +/* UBWC 10-bit Y/CbCr 4:2:0 */ +#define V4L2_PIX_FMT_NV12_TP10_UBWC v4l2_fourcc('Q', '1', '2', 'A') + /* two non contiguous planes - one Y, one Cr + Cb interleaved */ #define V4L2_PIX_FMT_NV12M v4l2_fourcc('N', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 */ #define V4L2_PIX_FMT_NV21M v4l2_fourcc('N', 'M', '2', '1') /* 21 Y/CrCb 4:2:0 */ @@ -693,6 +701,8 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_IPU3_SGBRG10 v4l2_fourcc('i', 'p', '3', 'g') /* IPU3 packed 10-bit GBRG bayer */ #define V4L2_PIX_FMT_IPU3_SGRBG10 v4l2_fourcc('i', 'p', '3', 'G') /* IPU3 packed 10-bit GRBG bayer */ #define V4L2_PIX_FMT_IPU3_SRGGB10 v4l2_fourcc('i', 'p', '3', 'r') /* IPU3 packed 10-bit RGGB bayer */ +#define V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010_VENUS \ + v4l2_fourcc('Q', 'P', '1', '0') /* Y/CbCr 4:2:0 P10 Venus*/ /* SDR formats - used only for Software Defined Radio devices */ #define V4L2_SDR_FMT_CU8 v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */