2019-08-26 15:09:31 +08:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Puunithaaraj Gopal <puunithaaraj.gopal@intel.com>
|
|
|
|
|
Date: Tue, 21 May 2019 23:59:41 +0800
|
|
|
|
|
Subject: [PATCH] media: ici: Add ICI_FORMAT_RGB24 macro for 24 bit RGB
|
|
|
|
|
|
|
|
|
|
ICI_FORMAT_RGB24 format added for ICI isys support
|
|
|
|
|
|
|
|
|
|
Tracked-On: HSD-1507216987
|
|
|
|
|
Tracked-On: PKT-2253
|
|
|
|
|
Signed-off-by: Puunithaaraj Gopal <puunithaaraj.gopal@intel.com>
|
|
|
|
|
---
|
|
|
|
|
drivers/media/pci/intel/ici/ici-isys-stream.c | 35 ++++++++++---------
|
|
|
|
|
include/uapi/linux/ici.h | 3 +-
|
|
|
|
|
2 files changed, 20 insertions(+), 18 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/drivers/media/pci/intel/ici/ici-isys-stream.c b/drivers/media/pci/intel/ici/ici-isys-stream.c
|
2020-10-27 02:14:06 +08:00
|
|
|
index 3187cae74d75..d8c403ee69b1 100644
|
2019-08-26 15:09:31 +08:00
|
|
|
--- a/drivers/media/pci/intel/ici/ici-isys-stream.c
|
|
|
|
|
+++ b/drivers/media/pci/intel/ici/ici-isys-stream.c
|
|
|
|
|
@@ -74,23 +74,24 @@ const struct ici_isys_pixelformat ici_isys_pfmts_be_soc[] = {
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const struct ici_isys_pixelformat ici_isys_pfmts_packed[] = {
|
|
|
|
|
- { ICI_FORMAT_UYVY, 16, 16, ICI_FORMAT_UYVY, IA_CSS_ISYS_FRAME_FORMAT_UYVY },
|
|
|
|
|
- { ICI_FORMAT_YUYV, 16, 16, ICI_FORMAT_YUYV, IA_CSS_ISYS_FRAME_FORMAT_YUYV },
|
|
|
|
|
- { ICI_FORMAT_RGB565, 16, 16, ICI_FORMAT_RGB565, IA_CSS_ISYS_FRAME_FORMAT_RGB565 },
|
|
|
|
|
- { ICI_FORMAT_RGB888, 24, 24, ICI_FORMAT_RGB888, IA_CSS_ISYS_FRAME_FORMAT_RGBA888 },
|
|
|
|
|
- { ICI_FORMAT_SBGGR12, 12, 12, ICI_FORMAT_SBGGR12, IA_CSS_ISYS_FRAME_FORMAT_RAW12 },
|
|
|
|
|
- { ICI_FORMAT_SGBRG12, 12, 12, ICI_FORMAT_SGBRG12, IA_CSS_ISYS_FRAME_FORMAT_RAW12 },
|
|
|
|
|
- { ICI_FORMAT_SGRBG12, 12, 12, ICI_FORMAT_SGRBG12, IA_CSS_ISYS_FRAME_FORMAT_RAW12 },
|
|
|
|
|
- { ICI_FORMAT_SRGGB12, 12, 12, ICI_FORMAT_SRGGB12, IA_CSS_ISYS_FRAME_FORMAT_RAW12 },
|
|
|
|
|
- { ICI_FORMAT_SBGGR10, 10, 10, ICI_FORMAT_SBGGR10, IA_CSS_ISYS_FRAME_FORMAT_RAW10 },
|
|
|
|
|
- { ICI_FORMAT_SGBRG10, 10, 10, ICI_FORMAT_SGBRG10, IA_CSS_ISYS_FRAME_FORMAT_RAW10 },
|
|
|
|
|
- { ICI_FORMAT_SGRBG10, 10, 10, ICI_FORMAT_SGRBG10, IA_CSS_ISYS_FRAME_FORMAT_RAW10 },
|
|
|
|
|
- { ICI_FORMAT_SRGGB10, 10, 10, ICI_FORMAT_SRGGB10, IA_CSS_ISYS_FRAME_FORMAT_RAW10 },
|
|
|
|
|
- { ICI_FORMAT_SBGGR8, 8, 8, ICI_FORMAT_SBGGR8, IA_CSS_ISYS_FRAME_FORMAT_RAW8 },
|
|
|
|
|
- { ICI_FORMAT_SGBRG8, 8, 8, ICI_FORMAT_SGBRG8, IA_CSS_ISYS_FRAME_FORMAT_RAW8 },
|
|
|
|
|
- { ICI_FORMAT_SGRBG8, 8, 8, ICI_FORMAT_SGRBG8, IA_CSS_ISYS_FRAME_FORMAT_RAW8 },
|
|
|
|
|
- { ICI_FORMAT_SRGGB8, 8, 8, ICI_FORMAT_SRGGB8, IA_CSS_ISYS_FRAME_FORMAT_RAW8 },
|
|
|
|
|
- { }
|
|
|
|
|
+
|
|
|
|
|
+ { ICI_FORMAT_UYVY, 16, 16, ICI_FORMAT_UYVY, IA_CSS_ISYS_FRAME_FORMAT_UYVY },
|
|
|
|
|
+ { ICI_FORMAT_YUYV, 16, 16, ICI_FORMAT_YUYV, IA_CSS_ISYS_FRAME_FORMAT_YUYV },
|
|
|
|
|
+ { ICI_FORMAT_RGB565, 16, 16, ICI_FORMAT_RGB565, IA_CSS_ISYS_FRAME_FORMAT_RGB565 },
|
|
|
|
|
+ { ICI_FORMAT_RGB24, 24, 24, ICI_FORMAT_RGB888, IA_CSS_ISYS_FRAME_FORMAT_RGBA888 },
|
|
|
|
|
+ { ICI_FORMAT_SBGGR12, 12, 12, ICI_FORMAT_SBGGR12, IA_CSS_ISYS_FRAME_FORMAT_RAW12 },
|
|
|
|
|
+ { ICI_FORMAT_SGBRG12, 12, 12, ICI_FORMAT_SGBRG12, IA_CSS_ISYS_FRAME_FORMAT_RAW12 },
|
|
|
|
|
+ { ICI_FORMAT_SGRBG12, 12, 12, ICI_FORMAT_SGRBG12, IA_CSS_ISYS_FRAME_FORMAT_RAW12 },
|
|
|
|
|
+ { ICI_FORMAT_SRGGB12, 12, 12, ICI_FORMAT_SRGGB12, IA_CSS_ISYS_FRAME_FORMAT_RAW12 },
|
|
|
|
|
+ { ICI_FORMAT_SBGGR10, 10, 10, ICI_FORMAT_SBGGR10, IA_CSS_ISYS_FRAME_FORMAT_RAW10 },
|
|
|
|
|
+ { ICI_FORMAT_SGBRG10, 10, 10, ICI_FORMAT_SGBRG10, IA_CSS_ISYS_FRAME_FORMAT_RAW10 },
|
|
|
|
|
+ { ICI_FORMAT_SGRBG10, 10, 10, ICI_FORMAT_SGRBG10, IA_CSS_ISYS_FRAME_FORMAT_RAW10 },
|
|
|
|
|
+ { ICI_FORMAT_SRGGB10, 10, 10, ICI_FORMAT_SRGGB10, IA_CSS_ISYS_FRAME_FORMAT_RAW10 },
|
|
|
|
|
+ { ICI_FORMAT_SBGGR8, 8, 8, ICI_FORMAT_SBGGR8, IA_CSS_ISYS_FRAME_FORMAT_RAW8 },
|
|
|
|
|
+ { ICI_FORMAT_SGBRG8, 8, 8, ICI_FORMAT_SGBRG8, IA_CSS_ISYS_FRAME_FORMAT_RAW8 },
|
|
|
|
|
+ { ICI_FORMAT_SGRBG8, 8, 8, ICI_FORMAT_SGRBG8, IA_CSS_ISYS_FRAME_FORMAT_RAW8 },
|
|
|
|
|
+ { ICI_FORMAT_SRGGB8, 8, 8, ICI_FORMAT_SRGGB8, IA_CSS_ISYS_FRAME_FORMAT_RAW8 },
|
|
|
|
|
+ { }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct pipeline_format_data {
|
|
|
|
|
diff --git a/include/uapi/linux/ici.h b/include/uapi/linux/ici.h
|
2020-10-27 02:14:06 +08:00
|
|
|
index 2855ec22290c..3560dc253fd9 100644
|
2019-08-26 15:09:31 +08:00
|
|
|
--- a/include/uapi/linux/ici.h
|
|
|
|
|
+++ b/include/uapi/linux/ici.h
|
|
|
|
|
@@ -26,6 +26,7 @@
|
|
|
|
|
enum ici_format
|
|
|
|
|
{
|
|
|
|
|
ICI_FORMAT_RGB888 = ici_fourcc_code('X', 'R', '2', '4'),
|
|
|
|
|
+ ICI_FORMAT_RGB24 = ici_fourcc_code('B', 'G', 'R', '3'),
|
|
|
|
|
ICI_FORMAT_RGB565 = ici_fourcc_code('R', 'G', 'B', 'P'),
|
|
|
|
|
ICI_FORMAT_UYVY = ici_fourcc_code('U', 'Y', 'V', 'Y'),
|
|
|
|
|
ICI_FORMAT_YUYV = ici_fourcc_code('Y', 'U', 'Y', 'V'),
|
|
|
|
|
@@ -46,7 +47,7 @@ enum ici_format
|
|
|
|
|
ICI_FORMAT_SGRBG10_DPCM8 = ici_fourcc_code('B', 'D', '1', '0'),
|
|
|
|
|
ICI_FORMAT_SRGGB10_DPCM8 = ici_fourcc_code('b', 'R', 'A', '8'),
|
|
|
|
|
ICI_FORMAT_NV12 = ici_fourcc_code('N', 'V', '1', '2'),
|
|
|
|
|
- ICI_FORMAT_COUNT = 22,
|
|
|
|
|
+ ICI_FORMAT_COUNT = 23,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define ICI_PAD_FLAGS_SINK (1 << 0)
|
|
|
|
|
--
|
|
|
|
|
https://clearlinux.org
|
|
|
|
|
|
