Skip to content

Commit 819d679

Browse files
committed
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: Mauro Carvalho Chehab <[email protected]>
1 parent 03723b9 commit 819d679

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

drivers/staging/media/atomisp/pci/atomisp_cmd.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1980,9 +1980,11 @@ v4l2_fmt_to_sh_fmt(u32 fmt)
19801980
return IA_CSS_FRAME_FORMAT_RGBA888;
19811981
case V4L2_PIX_FMT_RGB565:
19821982
return IA_CSS_FRAME_FORMAT_RGB565;
1983+
#if 0
19831984
case V4L2_PIX_FMT_JPEG:
19841985
case V4L2_PIX_FMT_CUSTOM_M10MO_RAW:
19851986
return IA_CSS_FRAME_FORMAT_BINARY_8;
1987+
#endif
19861988
case V4L2_PIX_FMT_SBGGR16:
19871989
case V4L2_PIX_FMT_SBGGR10:
19881990
case V4L2_PIX_FMT_SGBRG10:

drivers/staging/media/atomisp/pci/atomisp_ioctl.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -492,23 +492,22 @@ const struct atomisp_format_bridge atomisp_output_fmts[] = {
492492
.mbus_code = MEDIA_BUS_FMT_BGR565_2X8_LE,
493493
.sh_fmt = IA_CSS_FRAME_FORMAT_RGB565,
494494
.description = "16 RGB 5-6-5"
495+
#if 0
495496
}, {
496497
.pixelformat = V4L2_PIX_FMT_JPEG,
497498
.depth = 8,
498499
.mbus_code = MEDIA_BUS_FMT_JPEG_1X8,
499500
.sh_fmt = IA_CSS_FRAME_FORMAT_BINARY_8,
500501
.description = "JPEG"
501-
},
502-
#if 0
503-
{
502+
}, {
504503
/* This is a custom format being used by M10MO to send the RAW data */
505504
.pixelformat = V4L2_PIX_FMT_CUSTOM_M10MO_RAW,
506505
.depth = 8,
507506
.mbus_code = V4L2_MBUS_FMT_CUSTOM_M10MO_RAW,
508507
.sh_fmt = IA_CSS_FRAME_FORMAT_BINARY_8,
509508
.description = "Custom RAW for M10MO"
510-
},
511509
#endif
510+
},
512511
};
513512

514513
const struct atomisp_format_bridge *

0 commit comments

Comments
 (0)