media: ipu6: isys: Add support for monochrome media bus formats
Subsystems (2)
PATCH 1/1 media: ipu6: isys: Add support for monochrome media bus formats
Add support for monochrome media bus formats, for use with monochrome/IR camera sensors.
This has been tested on a Dell XPS 13 9320 with OV1A1B IR sensor.
--- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 4 +++ .../media/pci/intel/ipu6/ipu6-isys-subdev.c | 34 ++++++++++++++----- .../media/pci/intel/ipu6/ipu6-isys-video.c | 14 ++++++++ 3 files changed, 43 insertions(+), 9 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +4 -0
@@ -42,6 +42,10 @@ static const u32 csi2_supported_codes[] = {MEDIA_BUS_FMT_SGBRG8_1X8 ,MEDIA_BUS_FMT_SGRBG8_1X8 ,MEDIA_BUS_FMT_SRGGB8_1X8 , +MEDIA_BUS_FMT_Y8_1X8 , +MEDIA_BUS_FMT_Y10_1X10 , +MEDIA_BUS_FMT_Y12_1X12 , +MEDIA_BUS_FMT_Y16_1X16 ,MEDIA_BUS_FMT_META_8 ,MEDIA_BUS_FMT_META_10 , MEDIA_BUS_FMT_META_12,
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c +25 -9
@@ -25,24 +25,28 @@ unsigned int ipu6_isys_mbus_code_to_bpp(u32 code)case MEDIA_BUS_FMT_RGB565_1X16 :case MEDIA_BUS_FMT_UYVY8_1X16 :case MEDIA_BUS_FMT_YUYV8_1X16 : +case MEDIA_BUS_FMT_Y16_1X16 :case MEDIA_BUS_FMT_META_16 :return 16 ;case MEDIA_BUS_FMT_SBGGR12_1X12 :case MEDIA_BUS_FMT_SGBRG12_1X12 :case MEDIA_BUS_FMT_SGRBG12_1X12 :case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_Y12_1X12 :case MEDIA_BUS_FMT_META_12 :return 12 ;case MEDIA_BUS_FMT_SBGGR10_1X10 :case MEDIA_BUS_FMT_SGBRG10_1X10 :case MEDIA_BUS_FMT_SGRBG10_1X10 :case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_Y10_1X10 :case MEDIA_BUS_FMT_META_10 :return 10 ;case MEDIA_BUS_FMT_SBGGR8_1X8 :case MEDIA_BUS_FMT_SGBRG8_1X8 :case MEDIA_BUS_FMT_SGRBG8_1X8 :case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_Y8_1X8 :case MEDIA_BUS_FMT_META_8 :return 8 ;default :
@@ -65,21 +69,25 @@ unsigned int ipu6_isys_mbus_code_to_mipi(u32 code)case MEDIA_BUS_FMT_SGBRG16_1X16 :case MEDIA_BUS_FMT_SGRBG16_1X16 :case MEDIA_BUS_FMT_SRGGB16_1X16 : +case MEDIA_BUS_FMT_Y16_1X16 :return MIPI_CSI2_DT_RAW16 ;case MEDIA_BUS_FMT_SBGGR12_1X12 :case MEDIA_BUS_FMT_SGBRG12_1X12 :case MEDIA_BUS_FMT_SGRBG12_1X12 :case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_Y12_1X12 :return MIPI_CSI2_DT_RAW12 ;case MEDIA_BUS_FMT_SBGGR10_1X10 :case MEDIA_BUS_FMT_SGBRG10_1X10 :case MEDIA_BUS_FMT_SGRBG10_1X10 :case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_Y10_1X10 :return MIPI_CSI2_DT_RAW10 ;case MEDIA_BUS_FMT_SBGGR8_1X8 :case MEDIA_BUS_FMT_SGBRG8_1X8 :case MEDIA_BUS_FMT_SGRBG8_1X8 :case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_Y8_1X8 :return MIPI_CSI2_DT_RAW8 ;case MEDIA_BUS_FMT_META_8 :case MEDIA_BUS_FMT_META_10 :
@@ -96,15 +104,23 @@ unsigned int ipu6_isys_mbus_code_to_mipi(u32 code)bool ipu6_isys_is_bayer_format (u32 code) { -switch (ipu6_isys_mbus_code_to_mipi (code)) { -case MIPI_CSI2_DT_RAW8 : -case MIPI_CSI2_DT_RAW10 : -case MIPI_CSI2_DT_RAW12 : -case MIPI_CSI2_DT_RAW14 : -case MIPI_CSI2_DT_RAW16 : -case MIPI_CSI2_DT_RAW20 : -case MIPI_CSI2_DT_RAW24 : -case MIPI_CSI2_DT_RAW28 : +switch (code) { +case MEDIA_BUS_FMT_SBGGR8_1X8 : +case MEDIA_BUS_FMT_SGBRG8_1X8 : +case MEDIA_BUS_FMT_SGRBG8_1X8 : +case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_SBGGR10_1X10 : +case MEDIA_BUS_FMT_SGBRG10_1X10 : +case MEDIA_BUS_FMT_SGRBG10_1X10 : +case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_SBGGR12_1X12 : +case MEDIA_BUS_FMT_SGBRG12_1X12 : +case MEDIA_BUS_FMT_SGRBG12_1X12 : +case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_SRGGB16_1X16 : +case MEDIA_BUS_FMT_SGRBG16_1X16 : +case MEDIA_BUS_FMT_SGBRG16_1X16 : +case MEDIA_BUS_FMT_SBGGR16_1X16 :return true;default :return false;
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +14 -0
@@ -77,6 +77,20 @@ const struct ipu6_isys_pixelformat ipu6_isys_pfmts[] = { IPU6_FW_ISYS_FRAME_FORMAT_RAW10 }, {V4L2_PIX_FMT_SRGGB10P ,10 ,10 ,MEDIA_BUS_FMT_SRGGB10_1X10 , IPU6_FW_ISYS_FRAME_FORMAT_RAW10 }, + + { V4L2_PIX_FMT_GREY, 8, 8, MEDIA_BUS_FMT_Y8_1X8, + IPU6_FW_ISYS_FRAME_FORMAT_RAW8 }, + { V4L2_PIX_FMT_Y10, 16, 10, MEDIA_BUS_FMT_Y10_1X10, + IPU6_FW_ISYS_FRAME_FORMAT_RAW16 }, + { V4L2_PIX_FMT_Y12, 16, 12, MEDIA_BUS_FMT_Y12_1X12, + IPU6_FW_ISYS_FRAME_FORMAT_RAW16 }, + { V4L2_PIX_FMT_Y16, 16, 16, MEDIA_BUS_FMT_Y16_1X16, + IPU6_FW_ISYS_FRAME_FORMAT_RAW16 }, + { V4L2_PIX_FMT_Y10P, 10, 10, MEDIA_BUS_FMT_Y10_1X10, + IPU6_FW_ISYS_FRAME_FORMAT_RAW10 }, + { V4L2_PIX_FMT_Y12P, 12, 12, MEDIA_BUS_FMT_Y12_1X12, + IPU6_FW_ISYS_FRAME_FORMAT_RAW12 }, + { V4L2_PIX_FMT_UYVY, 16, 16, MEDIA_BUS_FMT_UYVY8_1X16, IPU6_FW_ISYS_FRAME_FORMAT_UYVY}, { V4L2_PIX_FMT_YUYV, 16, 16, MEDIA_BUS_FMT_YUYV8_1X16,
Signature · 1 line
2.51.0
Hans,
Thanks for the patch.
Quoted 130 lines · Hans de Goede
Add support for monochrome media bus formats, for use with monochrome/IR camera sensors.
This has been tested on a Dell XPS 13 9320 with OV1A1B IR sensor.
Signed-off-by Hans de Goede <[email protected]>--- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 4 +++ .../media/pci/intel/ipu6/ipu6-isys-subdev.c | 34 ++++++++++++++----- .../media/pci/intel/ipu6/ipu6-isys-video.c | 14 ++++++++ 3 files changed, 43 insertions(+), 9 deletions(-)drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +4
-0@@ -42,6 +42,10 @@ static const u32 csi2_supported_codes[] = {MEDIA_BUS_FMT_SGBRG8_1X8 ,MEDIA_BUS_FMT_SGRBG8_1X8 ,MEDIA_BUS_FMT_SRGGB8_1X8 , +MEDIA_BUS_FMT_Y8_1X8 , +MEDIA_BUS_FMT_Y10_1X10 , +MEDIA_BUS_FMT_Y12_1X12 , +MEDIA_BUS_FMT_Y16_1X16 ,MEDIA_BUS_FMT_META_8 ,MEDIA_BUS_FMT_META_10 , MEDIA_BUS_FMT_META_12,drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c +25
-9@@ -25,24 +25,28 @@ unsigned int ipu6_isys_mbus_code_to_bpp(u32 code)case MEDIA_BUS_FMT_RGB565_1X16 :case MEDIA_BUS_FMT_UYVY8_1X16 :case MEDIA_BUS_FMT_YUYV8_1X16 : +case MEDIA_BUS_FMT_Y16_1X16 :case MEDIA_BUS_FMT_META_16 :return 16 ;case MEDIA_BUS_FMT_SBGGR12_1X12 :case MEDIA_BUS_FMT_SGBRG12_1X12 :case MEDIA_BUS_FMT_SGRBG12_1X12 :case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_Y12_1X12 :case MEDIA_BUS_FMT_META_12 :return 12 ;case MEDIA_BUS_FMT_SBGGR10_1X10 :case MEDIA_BUS_FMT_SGBRG10_1X10 :case MEDIA_BUS_FMT_SGRBG10_1X10 :case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_Y10_1X10 :case MEDIA_BUS_FMT_META_10 :return 10 ;case MEDIA_BUS_FMT_SBGGR8_1X8 :case MEDIA_BUS_FMT_SGBRG8_1X8 :case MEDIA_BUS_FMT_SGRBG8_1X8 :case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_Y8_1X8 :case MEDIA_BUS_FMT_META_8 :return 8 ;default :@@ -65,21 +69,25 @@ unsigned int ipu6_isys_mbus_code_to_mipi(u32 code)case MEDIA_BUS_FMT_SGBRG16_1X16 :case MEDIA_BUS_FMT_SGRBG16_1X16 :case MEDIA_BUS_FMT_SRGGB16_1X16 : +case MEDIA_BUS_FMT_Y16_1X16 :return MIPI_CSI2_DT_RAW16 ;case MEDIA_BUS_FMT_SBGGR12_1X12 :case MEDIA_BUS_FMT_SGBRG12_1X12 :case MEDIA_BUS_FMT_SGRBG12_1X12 :case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_Y12_1X12 :return MIPI_CSI2_DT_RAW12 ;case MEDIA_BUS_FMT_SBGGR10_1X10 :case MEDIA_BUS_FMT_SGBRG10_1X10 :case MEDIA_BUS_FMT_SGRBG10_1X10 :case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_Y10_1X10 :return MIPI_CSI2_DT_RAW10 ;case MEDIA_BUS_FMT_SBGGR8_1X8 :case MEDIA_BUS_FMT_SGBRG8_1X8 :case MEDIA_BUS_FMT_SGRBG8_1X8 :case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_Y8_1X8 :return MIPI_CSI2_DT_RAW8 ;case MEDIA_BUS_FMT_META_8 :case MEDIA_BUS_FMT_META_10 :@@ -96,15 +104,23 @@ unsigned int ipu6_isys_mbus_code_to_mipi(u32 code)bool ipu6_isys_is_bayer_format (u32 code) { -switch (ipu6_isys_mbus_code_to_mipi (code)) { -case MIPI_CSI2_DT_RAW8 : -case MIPI_CSI2_DT_RAW10 : -case MIPI_CSI2_DT_RAW12 : -case MIPI_CSI2_DT_RAW14 : -case MIPI_CSI2_DT_RAW16 : -case MIPI_CSI2_DT_RAW20 : -case MIPI_CSI2_DT_RAW24 : -case MIPI_CSI2_DT_RAW28 : +switch (code) { +case MEDIA_BUS_FMT_SBGGR8_1X8 : +case MEDIA_BUS_FMT_SGBRG8_1X8 : +case MEDIA_BUS_FMT_SGRBG8_1X8 : +case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_SBGGR10_1X10 : +case MEDIA_BUS_FMT_SGBRG10_1X10 : +case MEDIA_BUS_FMT_SGRBG10_1X10 : +case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_SBGGR12_1X12 : +case MEDIA_BUS_FMT_SGBRG12_1X12 : +case MEDIA_BUS_FMT_SGRBG12_1X12 : +case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_SRGGB16_1X16 : +case MEDIA_BUS_FMT_SGRBG16_1X16 : +case MEDIA_BUS_FMT_SGBRG16_1X16 : +case MEDIA_BUS_FMT_SBGGR16_1X16 :return true;default :return false;drivers/media/pci/intel/ipu6/ipu6-isys-video.c +3
-0@@ -77,6 +77,20 @@ const struct ipu6_isys_pixelformat ipu6_isys_pfmts[] = { IPU6_FW_ISYS_FRAME_FORMAT_RAW10 }, {V4L2_PIX_FMT_SRGGB10P ,10 ,10 ,MEDIA_BUS_FMT_SRGGB10_1X10 , IPU6_FW_ISYS_FRAME_FORMAT_RAW10 }, + + { V4L2_PIX_FMT_GREY, 8, 8, MEDIA_BUS_FMT_Y8_1X8, + IPU6_FW_ISYS_FRAME_FORMAT_RAW8 },
drivers/media/pci/intel/ipu6/ipu6-isys-video.c const struct ipu6_isys_pixelformat ipu6_isys_pfmts[] = { · line 92
Quoted 10 lines
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +10
-0+ {V4L2_PIX_FMT_Y10 ,16 ,10 ,MEDIA_BUS_FMT_Y10_1X10 , + IPU6_FW_ISYS_FRAME_FORMAT_RAW16 }, + { V4L2_PIX_FMT_Y12, 16, 12, MEDIA_BUS_FMT_Y12_1X12, + IPU6_FW_ISYS_FRAME_FORMAT_RAW16 }, + { V4L2_PIX_FMT_Y16, 16, 16, MEDIA_BUS_FMT_Y16_1X16, + IPU6_FW_ISYS_FRAME_FORMAT_RAW16 }, + { V4L2_PIX_FMT_Y10P, 10, 10, MEDIA_BUS_FMT_Y10_1X10, + IPU6_FW_ISYS_FRAME_FORMAT_RAW10 }, + { V4L2_PIX_FMT_Y12P, 12, 12, MEDIA_BUS_FMT_Y12_1X12, + IPU6_FW_ISYS_FRAME_FORMAT_RAW12 },
The code looks fine for me. I am wondering which sensor to test these packed format for IPU6.
Quoted 5 lines
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +1
-0+ {V4L2_PIX_FMT_UYVY ,16 ,16 ,MEDIA_BUS_FMT_UYVY8_1X16 , IPU6_FW_ISYS_FRAME_FORMAT_UYVY}, { V4L2_PIX_FMT_YUYV, 16, 16, MEDIA_BUS_FMT_YUYV8_1X16,
Signature · 2 lines
Best regards, Bingbu Cao
Sakari Ailus
maintainerHi Bingbu, Hans,
Quoted 141 lines · Bingbu Cao
Hans,
Thanks for the patch.
Quoted 135 lines · Hans de Goede
Add support for monochrome media bus formats, for use with monochrome/IR camera sensors.
This has been tested on a Dell XPS 13 9320 with OV1A1B IR sensor.
Signed-off-by Hans de Goede <[email protected]>--- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 4 +++ .../media/pci/intel/ipu6/ipu6-isys-subdev.c | 34 ++++++++++++++----- .../media/pci/intel/ipu6/ipu6-isys-video.c | 14 ++++++++ 3 files changed, 43 insertions(+), 9 deletions(-)drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +4
-0@@ -42,6 +42,10 @@ static const u32 csi2_supported_codes[] = {MEDIA_BUS_FMT_SGBRG8_1X8 ,MEDIA_BUS_FMT_SGRBG8_1X8 ,MEDIA_BUS_FMT_SRGGB8_1X8 , +MEDIA_BUS_FMT_Y8_1X8 , +MEDIA_BUS_FMT_Y10_1X10 , +MEDIA_BUS_FMT_Y12_1X12 , +MEDIA_BUS_FMT_Y16_1X16 ,MEDIA_BUS_FMT_META_8 ,MEDIA_BUS_FMT_META_10 , MEDIA_BUS_FMT_META_12,drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c +25
-9@@ -25,24 +25,28 @@ unsigned int ipu6_isys_mbus_code_to_bpp(u32 code)case MEDIA_BUS_FMT_RGB565_1X16 :case MEDIA_BUS_FMT_UYVY8_1X16 :case MEDIA_BUS_FMT_YUYV8_1X16 : +case MEDIA_BUS_FMT_Y16_1X16 :case MEDIA_BUS_FMT_META_16 :return 16 ;case MEDIA_BUS_FMT_SBGGR12_1X12 :case MEDIA_BUS_FMT_SGBRG12_1X12 :case MEDIA_BUS_FMT_SGRBG12_1X12 :case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_Y12_1X12 :case MEDIA_BUS_FMT_META_12 :return 12 ;case MEDIA_BUS_FMT_SBGGR10_1X10 :case MEDIA_BUS_FMT_SGBRG10_1X10 :case MEDIA_BUS_FMT_SGRBG10_1X10 :case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_Y10_1X10 :case MEDIA_BUS_FMT_META_10 :return 10 ;case MEDIA_BUS_FMT_SBGGR8_1X8 :case MEDIA_BUS_FMT_SGBRG8_1X8 :case MEDIA_BUS_FMT_SGRBG8_1X8 :case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_Y8_1X8 :case MEDIA_BUS_FMT_META_8 :return 8 ;default :@@ -65,21 +69,25 @@ unsigned int ipu6_isys_mbus_code_to_mipi(u32 code)case MEDIA_BUS_FMT_SGBRG16_1X16 :case MEDIA_BUS_FMT_SGRBG16_1X16 :case MEDIA_BUS_FMT_SRGGB16_1X16 : +case MEDIA_BUS_FMT_Y16_1X16 :return MIPI_CSI2_DT_RAW16 ;case MEDIA_BUS_FMT_SBGGR12_1X12 :case MEDIA_BUS_FMT_SGBRG12_1X12 :case MEDIA_BUS_FMT_SGRBG12_1X12 :case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_Y12_1X12 :return MIPI_CSI2_DT_RAW12 ;case MEDIA_BUS_FMT_SBGGR10_1X10 :case MEDIA_BUS_FMT_SGBRG10_1X10 :case MEDIA_BUS_FMT_SGRBG10_1X10 :case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_Y10_1X10 :return MIPI_CSI2_DT_RAW10 ;case MEDIA_BUS_FMT_SBGGR8_1X8 :case MEDIA_BUS_FMT_SGBRG8_1X8 :case MEDIA_BUS_FMT_SGRBG8_1X8 :case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_Y8_1X8 :return MIPI_CSI2_DT_RAW8 ;case MEDIA_BUS_FMT_META_8 :case MEDIA_BUS_FMT_META_10 :@@ -96,15 +104,23 @@ unsigned int ipu6_isys_mbus_code_to_mipi(u32 code)bool ipu6_isys_is_bayer_format (u32 code) { -switch (ipu6_isys_mbus_code_to_mipi (code)) { -case MIPI_CSI2_DT_RAW8 : -case MIPI_CSI2_DT_RAW10 : -case MIPI_CSI2_DT_RAW12 : -case MIPI_CSI2_DT_RAW14 : -case MIPI_CSI2_DT_RAW16 : -case MIPI_CSI2_DT_RAW20 : -case MIPI_CSI2_DT_RAW24 : -case MIPI_CSI2_DT_RAW28 : +switch (code) { +case MEDIA_BUS_FMT_SBGGR8_1X8 : +case MEDIA_BUS_FMT_SGBRG8_1X8 : +case MEDIA_BUS_FMT_SGRBG8_1X8 : +case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_SBGGR10_1X10 : +case MEDIA_BUS_FMT_SGBRG10_1X10 : +case MEDIA_BUS_FMT_SGRBG10_1X10 : +case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_SBGGR12_1X12 : +case MEDIA_BUS_FMT_SGBRG12_1X12 : +case MEDIA_BUS_FMT_SGRBG12_1X12 : +case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_SRGGB16_1X16 : +case MEDIA_BUS_FMT_SGRBG16_1X16 : +case MEDIA_BUS_FMT_SGBRG16_1X16 : +case MEDIA_BUS_FMT_SBGGR16_1X16 :return true;default :return false;drivers/media/pci/intel/ipu6/ipu6-isys-video.c +8
-0@@ -77,6 +77,20 @@ const struct ipu6_isys_pixelformat ipu6_isys_pfmts[] = { IPU6_FW_ISYS_FRAME_FORMAT_RAW10 }, {V4L2_PIX_FMT_SRGGB10P ,10 ,10 ,MEDIA_BUS_FMT_SRGGB10_1X10 , IPU6_FW_ISYS_FRAME_FORMAT_RAW10 }, + + { V4L2_PIX_FMT_GREY, 8, 8, MEDIA_BUS_FMT_Y8_1X8, + IPU6_FW_ISYS_FRAME_FORMAT_RAW8 }, + { V4L2_PIX_FMT_Y10, 16, 10, MEDIA_BUS_FMT_Y10_1X10, + IPU6_FW_ISYS_FRAME_FORMAT_RAW16 }, + { V4L2_PIX_FMT_Y12, 16, 12, MEDIA_BUS_FMT_Y12_1X12, + IPU6_FW_ISYS_FRAME_FORMAT_RAW16 }, + { V4L2_PIX_FMT_Y16, 16, 16, MEDIA_BUS_FMT_Y16_1X16,
Quoted 8 lines
drivers/media/pci/intel/ipu6/ipu6-isys-video.c const struct ipu6_isys_pixelformat ipu6_isys_pfmts[] = { · line 92
Quoted 5 lines
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +5
-0+ IPU6_FW_ISYS_FRAME_FORMAT_RAW16 }, + {V4L2_PIX_FMT_Y10P ,10 ,10 ,MEDIA_BUS_FMT_Y10_1X10 , + IPU6_FW_ISYS_FRAME_FORMAT_RAW10 }, + { V4L2_PIX_FMT_Y12P, 12, 12, MEDIA_BUS_FMT_Y12_1X12, + IPU6_FW_ISYS_FRAME_FORMAT_RAW12 },The code looks fine for me. I am wondering which sensor to test these packed format for IPU6.
Such packed formats appear to be defined for Bayer formats, too, so I'd expect them to work as the Bayer equivalents that are already supported.
Quoted 7 lines
Quoted 6 lines
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +1
-0+ {V4L2_PIX_FMT_UYVY ,16 ,16 ,MEDIA_BUS_FMT_UYVY8_1X16 , IPU6_FW_ISYS_FRAME_FORMAT_UYVY}, { V4L2_PIX_FMT_YUYV, 16, 16, MEDIA_BUS_FMT_YUYV8_1X16,
Signature · 3 lines
Regards, Sakari Ailus
Hi Bingbu, Sakari,
Quoted 153 lines · Sakari Ailus
Hi Bingbu, Hans,
Quoted 141 lines · Bingbu Cao
Hans,
Thanks for the patch.
Quoted 135 lines · Hans de Goede
Add support for monochrome media bus formats, for use with monochrome/IR camera sensors.
This has been tested on a Dell XPS 13 9320 with OV1A1B IR sensor.
Signed-off-by Hans de Goede <[email protected]>--- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 4 +++ .../media/pci/intel/ipu6/ipu6-isys-subdev.c | 34 ++++++++++++++----- .../media/pci/intel/ipu6/ipu6-isys-video.c | 14 ++++++++ 3 files changed, 43 insertions(+), 9 deletions(-)drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +4
-0@@ -42,6 +42,10 @@ static const u32 csi2_supported_codes[] = {MEDIA_BUS_FMT_SGBRG8_1X8 ,MEDIA_BUS_FMT_SGRBG8_1X8 ,MEDIA_BUS_FMT_SRGGB8_1X8 , +MEDIA_BUS_FMT_Y8_1X8 , +MEDIA_BUS_FMT_Y10_1X10 , +MEDIA_BUS_FMT_Y12_1X12 , +MEDIA_BUS_FMT_Y16_1X16 ,MEDIA_BUS_FMT_META_8 ,MEDIA_BUS_FMT_META_10 , MEDIA_BUS_FMT_META_12,drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c +25
-9@@ -25,24 +25,28 @@ unsigned int ipu6_isys_mbus_code_to_bpp(u32 code)case MEDIA_BUS_FMT_RGB565_1X16 :case MEDIA_BUS_FMT_UYVY8_1X16 :case MEDIA_BUS_FMT_YUYV8_1X16 : +case MEDIA_BUS_FMT_Y16_1X16 :case MEDIA_BUS_FMT_META_16 :return 16 ;case MEDIA_BUS_FMT_SBGGR12_1X12 :case MEDIA_BUS_FMT_SGBRG12_1X12 :case MEDIA_BUS_FMT_SGRBG12_1X12 :case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_Y12_1X12 :case MEDIA_BUS_FMT_META_12 :return 12 ;case MEDIA_BUS_FMT_SBGGR10_1X10 :case MEDIA_BUS_FMT_SGBRG10_1X10 :case MEDIA_BUS_FMT_SGRBG10_1X10 :case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_Y10_1X10 :case MEDIA_BUS_FMT_META_10 :return 10 ;case MEDIA_BUS_FMT_SBGGR8_1X8 :case MEDIA_BUS_FMT_SGBRG8_1X8 :case MEDIA_BUS_FMT_SGRBG8_1X8 :case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_Y8_1X8 :case MEDIA_BUS_FMT_META_8 :return 8 ;default :@@ -65,21 +69,25 @@ unsigned int ipu6_isys_mbus_code_to_mipi(u32 code)case MEDIA_BUS_FMT_SGBRG16_1X16 :case MEDIA_BUS_FMT_SGRBG16_1X16 :case MEDIA_BUS_FMT_SRGGB16_1X16 : +case MEDIA_BUS_FMT_Y16_1X16 :return MIPI_CSI2_DT_RAW16 ;case MEDIA_BUS_FMT_SBGGR12_1X12 :case MEDIA_BUS_FMT_SGBRG12_1X12 :case MEDIA_BUS_FMT_SGRBG12_1X12 :case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_Y12_1X12 :return MIPI_CSI2_DT_RAW12 ;case MEDIA_BUS_FMT_SBGGR10_1X10 :case MEDIA_BUS_FMT_SGBRG10_1X10 :case MEDIA_BUS_FMT_SGRBG10_1X10 :case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_Y10_1X10 :return MIPI_CSI2_DT_RAW10 ;case MEDIA_BUS_FMT_SBGGR8_1X8 :case MEDIA_BUS_FMT_SGBRG8_1X8 :case MEDIA_BUS_FMT_SGRBG8_1X8 :case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_Y8_1X8 :return MIPI_CSI2_DT_RAW8 ;case MEDIA_BUS_FMT_META_8 :case MEDIA_BUS_FMT_META_10 :@@ -96,15 +104,23 @@ unsigned int ipu6_isys_mbus_code_to_mipi(u32 code)bool ipu6_isys_is_bayer_format (u32 code) { -switch (ipu6_isys_mbus_code_to_mipi (code)) { -case MIPI_CSI2_DT_RAW8 : -case MIPI_CSI2_DT_RAW10 : -case MIPI_CSI2_DT_RAW12 : -case MIPI_CSI2_DT_RAW14 : -case MIPI_CSI2_DT_RAW16 : -case MIPI_CSI2_DT_RAW20 : -case MIPI_CSI2_DT_RAW24 : -case MIPI_CSI2_DT_RAW28 : +switch (code) { +case MEDIA_BUS_FMT_SBGGR8_1X8 : +case MEDIA_BUS_FMT_SGBRG8_1X8 : +case MEDIA_BUS_FMT_SGRBG8_1X8 : +case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_SBGGR10_1X10 : +case MEDIA_BUS_FMT_SGBRG10_1X10 : +case MEDIA_BUS_FMT_SGRBG10_1X10 : +case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_SBGGR12_1X12 : +case MEDIA_BUS_FMT_SGBRG12_1X12 : +case MEDIA_BUS_FMT_SGRBG12_1X12 : +case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_SRGGB16_1X16 : +case MEDIA_BUS_FMT_SGRBG16_1X16 : +case MEDIA_BUS_FMT_SGBRG16_1X16 : +case MEDIA_BUS_FMT_SBGGR16_1X16 :return true;default :return false;drivers/media/pci/intel/ipu6/ipu6-isys-video.c +8
-0@@ -77,6 +77,20 @@ const struct ipu6_isys_pixelformat ipu6_isys_pfmts[] = { IPU6_FW_ISYS_FRAME_FORMAT_RAW10 }, {V4L2_PIX_FMT_SRGGB10P ,10 ,10 ,MEDIA_BUS_FMT_SRGGB10_1X10 , IPU6_FW_ISYS_FRAME_FORMAT_RAW10 }, + + { V4L2_PIX_FMT_GREY, 8, 8, MEDIA_BUS_FMT_Y8_1X8, + IPU6_FW_ISYS_FRAME_FORMAT_RAW8 }, + { V4L2_PIX_FMT_Y10, 16, 10, MEDIA_BUS_FMT_Y10_1X10, + IPU6_FW_ISYS_FRAME_FORMAT_RAW16 }, + { V4L2_PIX_FMT_Y12, 16, 12, MEDIA_BUS_FMT_Y12_1X12, + IPU6_FW_ISYS_FRAME_FORMAT_RAW16 }, + { V4L2_PIX_FMT_Y16, 16, 16, MEDIA_BUS_FMT_Y16_1X16,Quoted 8 lines
drivers/media/pci/intel/ipu6/ipu6-isys-video.c const struct ipu6_isys_pixelformat ipu6_isys_pfmts[] = { · line 92
Quoted 5 lines
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +5
-0+ IPU6_FW_ISYS_FRAME_FORMAT_RAW16 }, + {V4L2_PIX_FMT_Y10P ,10 ,10 ,MEDIA_BUS_FMT_Y10_1X10 , + IPU6_FW_ISYS_FRAME_FORMAT_RAW10 }, + { V4L2_PIX_FMT_Y12P, 12, 12, MEDIA_BUS_FMT_Y12_1X12, + IPU6_FW_ISYS_FRAME_FORMAT_RAW12 },The code looks fine for me. I am wondering which sensor to test these packed format for IPU6.
Quoted 2 lines
Such packed formats appear to be defined for Bayer formats, too, so I'd expect them to work as the Bayer equivalents that are already supported.
Right, on the CSI side this is e.g. always 10 bits / pixel but then the isys can be configured to either store this in the in memory framebuffer either sparse using 16 bits / pixel or packed with std mipi packing.
Both paths (sparse + packed) have been tested with bayer patterns since the softISP supports both memory buffer formats.
For the monochrome support I've tested with the libcamera "cam" app using 16 bpp sparse + imagemagick to convert the raw Y buffers to png-s to look at the result:
magick -depth 16 -size 1312x816 gray:XXXXXXXX.bin -auto-level result.png
Note the 1312 is necessary because the stride for 1296x816 is 1312 bytes/line.
Regards,
Hans
Hans,
Thanks for the patch.
Quoted 145 lines · Hans de Goede
Add support for monochrome media bus formats, for use with monochrome/IR camera sensors.
This has been tested on a Dell XPS 13 9320 with OV1A1B IR sensor.
Signed-off-by Hans de Goede <[email protected]>--- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 4 +++ .../media/pci/intel/ipu6/ipu6-isys-subdev.c | 34 ++++++++++++++----- .../media/pci/intel/ipu6/ipu6-isys-video.c | 14 ++++++++ 3 files changed, 43 insertions(+), 9 deletions(-)drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +4
-0@@ -42,6 +42,10 @@ static const u32 csi2_supported_codes[] = {MEDIA_BUS_FMT_SGBRG8_1X8 ,MEDIA_BUS_FMT_SGRBG8_1X8 ,MEDIA_BUS_FMT_SRGGB8_1X8 , +MEDIA_BUS_FMT_Y8_1X8 , +MEDIA_BUS_FMT_Y10_1X10 , +MEDIA_BUS_FMT_Y12_1X12 , +MEDIA_BUS_FMT_Y16_1X16 ,MEDIA_BUS_FMT_META_8 ,MEDIA_BUS_FMT_META_10 , MEDIA_BUS_FMT_META_12,drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c +25
-9@@ -25,24 +25,28 @@ unsigned int ipu6_isys_mbus_code_to_bpp(u32 code)case MEDIA_BUS_FMT_RGB565_1X16 :case MEDIA_BUS_FMT_UYVY8_1X16 :case MEDIA_BUS_FMT_YUYV8_1X16 : +case MEDIA_BUS_FMT_Y16_1X16 :case MEDIA_BUS_FMT_META_16 :return 16 ;case MEDIA_BUS_FMT_SBGGR12_1X12 :case MEDIA_BUS_FMT_SGBRG12_1X12 :case MEDIA_BUS_FMT_SGRBG12_1X12 :case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_Y12_1X12 :case MEDIA_BUS_FMT_META_12 :return 12 ;case MEDIA_BUS_FMT_SBGGR10_1X10 :case MEDIA_BUS_FMT_SGBRG10_1X10 :case MEDIA_BUS_FMT_SGRBG10_1X10 :case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_Y10_1X10 :case MEDIA_BUS_FMT_META_10 :return 10 ;case MEDIA_BUS_FMT_SBGGR8_1X8 :case MEDIA_BUS_FMT_SGBRG8_1X8 :case MEDIA_BUS_FMT_SGRBG8_1X8 :case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_Y8_1X8 :case MEDIA_BUS_FMT_META_8 :return 8 ;default :@@ -65,21 +69,25 @@ unsigned int ipu6_isys_mbus_code_to_mipi(u32 code)case MEDIA_BUS_FMT_SGBRG16_1X16 :case MEDIA_BUS_FMT_SGRBG16_1X16 :case MEDIA_BUS_FMT_SRGGB16_1X16 : +case MEDIA_BUS_FMT_Y16_1X16 :return MIPI_CSI2_DT_RAW16 ;case MEDIA_BUS_FMT_SBGGR12_1X12 :case MEDIA_BUS_FMT_SGBRG12_1X12 :case MEDIA_BUS_FMT_SGRBG12_1X12 :case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_Y12_1X12 :return MIPI_CSI2_DT_RAW12 ;case MEDIA_BUS_FMT_SBGGR10_1X10 :case MEDIA_BUS_FMT_SGBRG10_1X10 :case MEDIA_BUS_FMT_SGRBG10_1X10 :case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_Y10_1X10 :return MIPI_CSI2_DT_RAW10 ;case MEDIA_BUS_FMT_SBGGR8_1X8 :case MEDIA_BUS_FMT_SGBRG8_1X8 :case MEDIA_BUS_FMT_SGRBG8_1X8 :case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_Y8_1X8 :return MIPI_CSI2_DT_RAW8 ;case MEDIA_BUS_FMT_META_8 :case MEDIA_BUS_FMT_META_10 :@@ -96,15 +104,23 @@ unsigned int ipu6_isys_mbus_code_to_mipi(u32 code)bool ipu6_isys_is_bayer_format (u32 code) { -switch (ipu6_isys_mbus_code_to_mipi (code)) { -case MIPI_CSI2_DT_RAW8 : -case MIPI_CSI2_DT_RAW10 : -case MIPI_CSI2_DT_RAW12 : -case MIPI_CSI2_DT_RAW14 : -case MIPI_CSI2_DT_RAW16 : -case MIPI_CSI2_DT_RAW20 : -case MIPI_CSI2_DT_RAW24 : -case MIPI_CSI2_DT_RAW28 : +switch (code) { +case MEDIA_BUS_FMT_SBGGR8_1X8 : +case MEDIA_BUS_FMT_SGBRG8_1X8 : +case MEDIA_BUS_FMT_SGRBG8_1X8 : +case MEDIA_BUS_FMT_SRGGB8_1X8 : +case MEDIA_BUS_FMT_SBGGR10_1X10 : +case MEDIA_BUS_FMT_SGBRG10_1X10 : +case MEDIA_BUS_FMT_SGRBG10_1X10 : +case MEDIA_BUS_FMT_SRGGB10_1X10 : +case MEDIA_BUS_FMT_SBGGR12_1X12 : +case MEDIA_BUS_FMT_SGBRG12_1X12 : +case MEDIA_BUS_FMT_SGRBG12_1X12 : +case MEDIA_BUS_FMT_SRGGB12_1X12 : +case MEDIA_BUS_FMT_SRGGB16_1X16 : +case MEDIA_BUS_FMT_SGRBG16_1X16 : +case MEDIA_BUS_FMT_SGBRG16_1X16 : +case MEDIA_BUS_FMT_SBGGR16_1X16 :return true;default :return false;drivers/media/pci/intel/ipu6/ipu6-isys-video.c +14
-0@@ -77,6 +77,20 @@ const struct ipu6_isys_pixelformat ipu6_isys_pfmts[] = { IPU6_FW_ISYS_FRAME_FORMAT_RAW10 }, {V4L2_PIX_FMT_SRGGB10P ,10 ,10 ,MEDIA_BUS_FMT_SRGGB10_1X10 , IPU6_FW_ISYS_FRAME_FORMAT_RAW10 }, + + { V4L2_PIX_FMT_GREY, 8, 8, MEDIA_BUS_FMT_Y8_1X8, + IPU6_FW_ISYS_FRAME_FORMAT_RAW8 }, + { V4L2_PIX_FMT_Y10, 16, 10, MEDIA_BUS_FMT_Y10_1X10, + IPU6_FW_ISYS_FRAME_FORMAT_RAW16 }, + { V4L2_PIX_FMT_Y12, 16, 12, MEDIA_BUS_FMT_Y12_1X12, + IPU6_FW_ISYS_FRAME_FORMAT_RAW16 }, + { V4L2_PIX_FMT_Y16, 16, 16, MEDIA_BUS_FMT_Y16_1X16, + IPU6_FW_ISYS_FRAME_FORMAT_RAW16 }, + { V4L2_PIX_FMT_Y10P, 10, 10, MEDIA_BUS_FMT_Y10_1X10, + IPU6_FW_ISYS_FRAME_FORMAT_RAW10 }, + { V4L2_PIX_FMT_Y12P, 12, 12, MEDIA_BUS_FMT_Y12_1X12, + IPU6_FW_ISYS_FRAME_FORMAT_RAW12 }, + { V4L2_PIX_FMT_UYVY, 16, 16, MEDIA_BUS_FMT_UYVY8_1X16, IPU6_FW_ISYS_FRAME_FORMAT_UYVY}, { V4L2_PIX_FMT_YUYV, 16, 16, MEDIA_BUS_FMT_YUYV8_1X16,
Signature · 2 lines
Best regards, Bingbu Cao