Skip to content

Commit fc2dbbd

Browse files
6by9popcornmix
authored andcommitted
media: rp1: cfe: Add a csi_dt value for 16bit formats
Raw 16bit formats didn't have a csi_dt value defined, which presumably would trip the WARN_ON(!fmt->csi_dt); in cfe_start_channel. The value is defined in CSI2 v2.0 as 0x2e, so set it accordingly. Signed-off-by: Dave Stevenson <[email protected]>
1 parent 01f6095 commit fc2dbbd

File tree

1 file changed

+5
-0
lines changed
  • drivers/media/platform/raspberrypi/rp1_cfe

1 file changed

+5
-0
lines changed

drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,27 +197,31 @@ static const struct cfe_fmt formats[] = {
197197
.fourcc = V4L2_PIX_FMT_SBGGR16,
198198
.code = MEDIA_BUS_FMT_SBGGR16_1X16,
199199
.depth = 16,
200+
.csi_dt = MIPI_CSI2_DT_RAW16,
200201
.flags = CFE_FORMAT_FLAG_FE_OUT,
201202
.remap = { V4L2_PIX_FMT_SBGGR16, V4L2_PIX_FMT_PISP_COMP1_BGGR },
202203
},
203204
{
204205
.fourcc = V4L2_PIX_FMT_SGBRG16,
205206
.code = MEDIA_BUS_FMT_SGBRG16_1X16,
206207
.depth = 16,
208+
.csi_dt = MIPI_CSI2_DT_RAW16,
207209
.flags = CFE_FORMAT_FLAG_FE_OUT,
208210
.remap = { V4L2_PIX_FMT_SGBRG16, V4L2_PIX_FMT_PISP_COMP1_GBRG },
209211
},
210212
{
211213
.fourcc = V4L2_PIX_FMT_SGRBG16,
212214
.code = MEDIA_BUS_FMT_SGRBG16_1X16,
213215
.depth = 16,
216+
.csi_dt = MIPI_CSI2_DT_RAW16,
214217
.flags = CFE_FORMAT_FLAG_FE_OUT,
215218
.remap = { V4L2_PIX_FMT_SGRBG16, V4L2_PIX_FMT_PISP_COMP1_GRBG },
216219
},
217220
{
218221
.fourcc = V4L2_PIX_FMT_SRGGB16,
219222
.code = MEDIA_BUS_FMT_SRGGB16_1X16,
220223
.depth = 16,
224+
.csi_dt = MIPI_CSI2_DT_RAW16,
221225
.flags = CFE_FORMAT_FLAG_FE_OUT,
222226
.remap = { V4L2_PIX_FMT_SRGGB16, V4L2_PIX_FMT_PISP_COMP1_RGGB },
223227
},
@@ -278,6 +282,7 @@ static const struct cfe_fmt formats[] = {
278282
.fourcc = V4L2_PIX_FMT_Y16,
279283
.code = MEDIA_BUS_FMT_Y16_1X16,
280284
.depth = 16,
285+
.csi_dt = MIPI_CSI2_DT_RAW16,
281286
.flags = CFE_FORMAT_FLAG_FE_OUT,
282287
},
283288
{

0 commit comments

Comments
 (0)