Skip to content

drivers: media: cfe: Workaround for 16-bit mismatch in the hardware #6935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
naushir merged 1 commit into from
Jul 4, 2025
Merged

drivers: media: cfe: Workaround for 16-bit mismatch in the hardware #6935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,8 +851,11 @@ static void cfe_start_channel(struct cfe_node *node)
width = source_fmt->width;
height = source_fmt->height;

/* Must have a valid CSI2 datatype. */
WARN_ON(!fmt->csi_dt);
/*
* Must have a valid CSI2 datatype, but it will be 0 for 16-bit
* formats to work-around the HW mismatch.
*/
WARN_ON(fmt->depth != 16 && !fmt->csi_dt);

/*
* Start the associated CSI2 Channel as well.
Expand Down
8 changes: 4 additions & 4 deletions drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,31 +197,31 @@ static const struct cfe_fmt formats[] = {
.fourcc = V4L2_PIX_FMT_SBGGR16,
.code = MEDIA_BUS_FMT_SBGGR16_1X16,
.depth = 16,
.csi_dt = MIPI_CSI2_DT_RAW16,
.csi_dt = 0, /* Avoid RP1 HW mismatch for 16-bit modes. */
.flags = CFE_FORMAT_FLAG_FE_OUT,
.remap = { V4L2_PIX_FMT_SBGGR16, V4L2_PIX_FMT_PISP_COMP1_BGGR },
},
{
.fourcc = V4L2_PIX_FMT_SGBRG16,
.code = MEDIA_BUS_FMT_SGBRG16_1X16,
.depth = 16,
.csi_dt = MIPI_CSI2_DT_RAW16,
.csi_dt = 0, /* Avoid RP1 HW mismatch for 16-bit modes. */
.flags = CFE_FORMAT_FLAG_FE_OUT,
.remap = { V4L2_PIX_FMT_SGBRG16, V4L2_PIX_FMT_PISP_COMP1_GBRG },
},
{
.fourcc = V4L2_PIX_FMT_SGRBG16,
.code = MEDIA_BUS_FMT_SGRBG16_1X16,
.depth = 16,
.csi_dt = MIPI_CSI2_DT_RAW16,
.csi_dt = 0, /* Avoid RP1 HW mismatch for 16-bit modes. */
.flags = CFE_FORMAT_FLAG_FE_OUT,
.remap = { V4L2_PIX_FMT_SGRBG16, V4L2_PIX_FMT_PISP_COMP1_GRBG },
},
{
.fourcc = V4L2_PIX_FMT_SRGGB16,
.code = MEDIA_BUS_FMT_SRGGB16_1X16,
.depth = 16,
.csi_dt = MIPI_CSI2_DT_RAW16,
.csi_dt = 0, /* Avoid RP1 HW mismatch for 16-bit modes. */
.flags = CFE_FORMAT_FLAG_FE_OUT,
.remap = { V4L2_PIX_FMT_SRGGB16, V4L2_PIX_FMT_PISP_COMP1_RGGB },
},
Expand Down