Commit 819d679b authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: atomisp: comment-out JPEG format

This is already disabled on some parts of the code, and trying
to use it with current firmware causes an error:

[   53.799946] atomisp-isp2 0000:00:03.0: can't create streams
[   53.799962] atomisp-isp2 0000:00:03.0: __get_frame_info 1600x900 (padded to 0) returned -22

So, completely disable reporting it.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 03723b92
...@@ -1980,9 +1980,11 @@ v4l2_fmt_to_sh_fmt(u32 fmt) ...@@ -1980,9 +1980,11 @@ v4l2_fmt_to_sh_fmt(u32 fmt)
return IA_CSS_FRAME_FORMAT_RGBA888; return IA_CSS_FRAME_FORMAT_RGBA888;
case V4L2_PIX_FMT_RGB565: case V4L2_PIX_FMT_RGB565:
return IA_CSS_FRAME_FORMAT_RGB565; return IA_CSS_FRAME_FORMAT_RGB565;
#if 0
case V4L2_PIX_FMT_JPEG: case V4L2_PIX_FMT_JPEG:
case V4L2_PIX_FMT_CUSTOM_M10MO_RAW: case V4L2_PIX_FMT_CUSTOM_M10MO_RAW:
return IA_CSS_FRAME_FORMAT_BINARY_8; return IA_CSS_FRAME_FORMAT_BINARY_8;
#endif
case V4L2_PIX_FMT_SBGGR16: case V4L2_PIX_FMT_SBGGR16:
case V4L2_PIX_FMT_SBGGR10: case V4L2_PIX_FMT_SBGGR10:
case V4L2_PIX_FMT_SGBRG10: case V4L2_PIX_FMT_SGBRG10:
......
...@@ -492,23 +492,22 @@ const struct atomisp_format_bridge atomisp_output_fmts[] = { ...@@ -492,23 +492,22 @@ const struct atomisp_format_bridge atomisp_output_fmts[] = {
.mbus_code = MEDIA_BUS_FMT_BGR565_2X8_LE, .mbus_code = MEDIA_BUS_FMT_BGR565_2X8_LE,
.sh_fmt = IA_CSS_FRAME_FORMAT_RGB565, .sh_fmt = IA_CSS_FRAME_FORMAT_RGB565,
.description = "16 RGB 5-6-5" .description = "16 RGB 5-6-5"
#if 0
}, { }, {
.pixelformat = V4L2_PIX_FMT_JPEG, .pixelformat = V4L2_PIX_FMT_JPEG,
.depth = 8, .depth = 8,
.mbus_code = MEDIA_BUS_FMT_JPEG_1X8, .mbus_code = MEDIA_BUS_FMT_JPEG_1X8,
.sh_fmt = IA_CSS_FRAME_FORMAT_BINARY_8, .sh_fmt = IA_CSS_FRAME_FORMAT_BINARY_8,
.description = "JPEG" .description = "JPEG"
}, }, {
#if 0
{
/* This is a custom format being used by M10MO to send the RAW data */ /* This is a custom format being used by M10MO to send the RAW data */
.pixelformat = V4L2_PIX_FMT_CUSTOM_M10MO_RAW, .pixelformat = V4L2_PIX_FMT_CUSTOM_M10MO_RAW,
.depth = 8, .depth = 8,
.mbus_code = V4L2_MBUS_FMT_CUSTOM_M10MO_RAW, .mbus_code = V4L2_MBUS_FMT_CUSTOM_M10MO_RAW,
.sh_fmt = IA_CSS_FRAME_FORMAT_BINARY_8, .sh_fmt = IA_CSS_FRAME_FORMAT_BINARY_8,
.description = "Custom RAW for M10MO" .description = "Custom RAW for M10MO"
},
#endif #endif
},
}; };
const struct atomisp_format_bridge * const struct atomisp_format_bridge *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment