summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuoniu.Zhou <guoniu.zhou@nxp.com>2018-10-25 11:14:52 +0800
committerJason Liu <jason.hui.liu@nxp.com>2019-02-12 10:34:58 +0800
commitb165e695ffdf710f92186c992bf7aa2ade37f22b (patch)
treef5826a96bb54f1c18d9499cf3e2e34c73c644dec
parent9cd958f9e737d30def08955a5817eda6674988d4 (diff)
MLK-20046-2: ISI: add YUV444M format support
add YUV444M format support Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com> (cherry picked from commit e424d16926d0320b31850bdd293e77c164a80661)
-rw-r--r--drivers/media/platform/imx8/mxc-isi-cap.c8
-rw-r--r--drivers/media/platform/imx8/mxc-isi-hw.c2
-rw-r--r--drivers/media/platform/imx8/mxc-isi-m2m.c2
3 files changed, 11 insertions, 1 deletions
diff --git a/drivers/media/platform/imx8/mxc-isi-cap.c b/drivers/media/platform/imx8/mxc-isi-cap.c
index 703cfed1e7d5..0eaa1fc03c11 100644
--- a/drivers/media/platform/imx8/mxc-isi-cap.c
+++ b/drivers/media/platform/imx8/mxc-isi-cap.c
@@ -98,6 +98,14 @@ struct mxc_isi_fmt mxc_isi_out_formats[] = {
.memplanes = 2,
.colplanes = 2,
.mbus_code = MEDIA_BUS_FMT_YUYV8_1X16,
+ }, {
+ .name = "YUV444M (Y-U-V)",
+ .fourcc = V4L2_PIX_FMT_YUV444M,
+ .depth = { 8, 8, 8 },
+ .color = MXC_ISI_OUT_FMT_YUV444_3P8P,
+ .memplanes = 3,
+ .colplanes = 3,
+ .mbus_code = MEDIA_BUS_FMT_YUV8_1X24,
}
};
diff --git a/drivers/media/platform/imx8/mxc-isi-hw.c b/drivers/media/platform/imx8/mxc-isi-hw.c
index 6f0d7bec13a1..f9736c54f293 100644
--- a/drivers/media/platform/imx8/mxc-isi-hw.c
+++ b/drivers/media/platform/imx8/mxc-isi-hw.c
@@ -84,6 +84,7 @@ static bool is_rgb(u32 pix_fmt)
{
if ((pix_fmt == V4L2_PIX_FMT_RGB565) ||
(pix_fmt == V4L2_PIX_FMT_RGB24) ||
+ (pix_fmt == V4L2_PIX_FMT_BGR32) ||
(pix_fmt == V4L2_PIX_FMT_XRGB32) ||
(pix_fmt == V4L2_PIX_FMT_BGR24) ||
(pix_fmt == V4L2_PIX_FMT_ARGB32)) {
@@ -97,6 +98,7 @@ static bool is_yuv(u32 pix_fmt)
{
if ((pix_fmt == V4L2_PIX_FMT_YUYV) ||
(pix_fmt == V4L2_PIX_FMT_YUV32) ||
+ (pix_fmt == V4L2_PIX_FMT_YUV444M) ||
(pix_fmt == V4L2_PIX_FMT_NV12)) {
return true;
} else {
diff --git a/drivers/media/platform/imx8/mxc-isi-m2m.c b/drivers/media/platform/imx8/mxc-isi-m2m.c
index 65c7df065a4a..805c0eeea8ee 100644
--- a/drivers/media/platform/imx8/mxc-isi-m2m.c
+++ b/drivers/media/platform/imx8/mxc-isi-m2m.c
@@ -39,7 +39,7 @@
#define file_to_ctx(file) \
container_of(file->private_data, struct mxc_isi_ctx, fh);
-extern struct mxc_isi_fmt mxc_isi_out_formats[8];
+extern struct mxc_isi_fmt mxc_isi_out_formats[9];
struct mxc_isi_fmt mxc_isi_input_formats[] = {
/* Pixel link input format */