[PATCH v4 05/11] media: imx8-isi: Apply RAW output format workaround at runtime
From: Guoniu Zhou
Date: Tue Sep 29 2026 - 04:53:21 EST
Refactor the RAW format handling by storing the actual hardware output
format (RAW10/RAW12) in the format table instead of the workaround value
RAW16. The RAW16 workaround is now applied at runtime in
mxc_isi_channel_set_output_format() via the new isi_out_raw_shifted()
helper in imx8-isi-regs.h.
This makes the format table accurately reflect the real hardware
capability.
Signed-off-by: Guoniu Zhou <guoniu.zhou@xxxxxxxxxxx>
---
Changes in v4:
- New patch
---
drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c | 7 ++++-
.../media/platform/nxp/imx8-isi/imx8-isi-regs.h | 13 ++++++++++
.../media/platform/nxp/imx8-isi/imx8-isi-video.c | 30 ++++++++--------------
3 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c
index 6aa760ce3605..cc52a90c2477 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c
@@ -411,13 +411,18 @@ void mxc_isi_channel_set_output_format(struct mxc_isi_pipe *pipe,
struct v4l2_pix_format_mplane *format)
{
u32 val;
+ u32 fmt;
/* set outbuf format */
dev_dbg(pipe->isi->dev, "output format %p4cc", &format->pixelformat);
+ fmt = isi_out_raw_shifted(info->isi_out_format)
+ ? CHNL_IMG_CTRL_FORMAT_RAW16
+ : info->isi_out_format;
+
val = mxc_isi_read(pipe, CHNL_IMG_CTRL);
val &= ~CHNL_IMG_CTRL_FORMAT_MASK;
- val |= CHNL_IMG_CTRL_FORMAT(info->isi_out_format);
+ val |= CHNL_IMG_CTRL_FORMAT(fmt);
mxc_isi_write(pipe, CHNL_IMG_CTRL, val);
/* line pitch */
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h b/drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h
index c704be882705..0f3ada30e71e 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-regs.h
@@ -421,4 +421,17 @@
/* Channel Input Buffer Extended Address Bits */
#define CHNL_IN_BUF_XTND_ADDR 0x00b8
+/*
+ * The ISI shifts the 10-bit and 12-bit RAW formats left by 6 and 4 bits when
+ * using CHNL_IMG_CTRL_FORMAT_RAW10 or CHNL_IMG_CTRL_FORMAT_RAW12 respectively,
+ * to align the bits to the left and pad with zeros in the LSBs. The
+ * corresponding V4L2 formats are however right-aligned, so
+ * CHNL_IMG_CTRL_FORMAT_RAW16 must be used to avoid the left shift.
+ */
+static inline bool isi_out_raw_shifted(u32 format)
+{
+ return format == CHNL_IMG_CTRL_FORMAT_RAW10 ||
+ format == CHNL_IMG_CTRL_FORMAT_RAW12;
+}
+
#endif /* __IMX8_ISI_REGS_H__ */
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c
index 21849af3121b..365057db47bd 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c
@@ -218,15 +218,7 @@ static const struct mxc_isi_format_info mxc_isi_formats[] = {
.depth = { 32 },
.encoding = MXC_ISI_ENC_RGB,
},
- /*
- * RAW formats
- *
- * The ISI shifts the 10-bit and 12-bit formats left by 6 and 4 bits
- * when using CHNL_IMG_CTRL_FORMAT_RAW10 or MXC_ISI_OUT_FMT_RAW12
- * respectively, to align the bits to the left and pad with zeros in
- * the LSBs. The corresponding V4L2 formats are however right-aligned,
- * we have to use CHNL_IMG_CTRL_FORMAT_RAW16 to avoid the left shift.
- */
+ /* RAW formats */
{
.mbus_code = MEDIA_BUS_FMT_Y8_1X8,
.fourcc = V4L2_PIX_FMT_GREY,
@@ -240,7 +232,7 @@ static const struct mxc_isi_format_info mxc_isi_formats[] = {
.mbus_code = MEDIA_BUS_FMT_Y10_1X10,
.fourcc = V4L2_PIX_FMT_Y10,
.type = MXC_ISI_VIDEO_CAP,
- .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW16,
+ .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW10,
.mem_planes = 1,
.color_planes = 1,
.depth = { 16 },
@@ -249,7 +241,7 @@ static const struct mxc_isi_format_info mxc_isi_formats[] = {
.mbus_code = MEDIA_BUS_FMT_Y12_1X12,
.fourcc = V4L2_PIX_FMT_Y12,
.type = MXC_ISI_VIDEO_CAP,
- .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW16,
+ .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW12,
.mem_planes = 1,
.color_planes = 1,
.depth = { 16 },
@@ -312,7 +304,7 @@ static const struct mxc_isi_format_info mxc_isi_formats[] = {
.mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10,
.fourcc = V4L2_PIX_FMT_SBGGR10,
.type = MXC_ISI_VIDEO_CAP,
- .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW16,
+ .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW10,
.mem_planes = 1,
.color_planes = 1,
.depth = { 16 },
@@ -321,7 +313,7 @@ static const struct mxc_isi_format_info mxc_isi_formats[] = {
.mbus_code = MEDIA_BUS_FMT_SGBRG10_1X10,
.fourcc = V4L2_PIX_FMT_SGBRG10,
.type = MXC_ISI_VIDEO_CAP,
- .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW16,
+ .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW10,
.mem_planes = 1,
.color_planes = 1,
.depth = { 16 },
@@ -330,7 +322,7 @@ static const struct mxc_isi_format_info mxc_isi_formats[] = {
.mbus_code = MEDIA_BUS_FMT_SGRBG10_1X10,
.fourcc = V4L2_PIX_FMT_SGRBG10,
.type = MXC_ISI_VIDEO_CAP,
- .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW16,
+ .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW10,
.mem_planes = 1,
.color_planes = 1,
.depth = { 16 },
@@ -339,7 +331,7 @@ static const struct mxc_isi_format_info mxc_isi_formats[] = {
.mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10,
.fourcc = V4L2_PIX_FMT_SRGGB10,
.type = MXC_ISI_VIDEO_CAP,
- .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW16,
+ .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW10,
.mem_planes = 1,
.color_planes = 1,
.depth = { 16 },
@@ -348,7 +340,7 @@ static const struct mxc_isi_format_info mxc_isi_formats[] = {
.mbus_code = MEDIA_BUS_FMT_SBGGR12_1X12,
.fourcc = V4L2_PIX_FMT_SBGGR12,
.type = MXC_ISI_VIDEO_CAP,
- .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW16,
+ .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW12,
.mem_planes = 1,
.color_planes = 1,
.depth = { 16 },
@@ -357,7 +349,7 @@ static const struct mxc_isi_format_info mxc_isi_formats[] = {
.mbus_code = MEDIA_BUS_FMT_SGBRG12_1X12,
.fourcc = V4L2_PIX_FMT_SGBRG12,
.type = MXC_ISI_VIDEO_CAP,
- .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW16,
+ .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW12,
.mem_planes = 1,
.color_planes = 1,
.depth = { 16 },
@@ -366,7 +358,7 @@ static const struct mxc_isi_format_info mxc_isi_formats[] = {
.mbus_code = MEDIA_BUS_FMT_SGRBG12_1X12,
.fourcc = V4L2_PIX_FMT_SGRBG12,
.type = MXC_ISI_VIDEO_CAP,
- .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW16,
+ .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW12,
.mem_planes = 1,
.color_planes = 1,
.depth = { 16 },
@@ -375,7 +367,7 @@ static const struct mxc_isi_format_info mxc_isi_formats[] = {
.mbus_code = MEDIA_BUS_FMT_SRGGB12_1X12,
.fourcc = V4L2_PIX_FMT_SRGGB12,
.type = MXC_ISI_VIDEO_CAP,
- .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW16,
+ .isi_out_format = CHNL_IMG_CTRL_FORMAT_RAW12,
.mem_planes = 1,
.color_planes = 1,
.depth = { 16 },
--
2.34.1