diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-05-10 10:47:34 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-07-08 18:03:05 +0100 |
| commit | a1a60e7ac274dccadad81d8c78f8c8fb419be86d (patch) | |
| tree | 8051b141849e6410d44408fd3a2cf57d2334334a /drivers/staging/media/imx/imx7-media-csi.c | |
| parent | 5c42cd9dfa7d39ded3a2095ac4208b84d14298bd (diff) | |
media: staging: media: imx: imx7-media-csi: Simplify default format in try_fmt
When trying a format on the video node, if the requested pixel format
isn't supported, fallback to the default with a simpler logic.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Rui Miguel Silva <rmfrfs@gmail.com>
Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/staging/media/imx/imx7-media-csi.c')
| -rw-r--r-- | drivers/staging/media/imx/imx7-media-csi.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c index 19aa8724f6c1..fd707a49be3f 100644 --- a/drivers/staging/media/imx/imx7-media-csi.c +++ b/drivers/staging/media/imx/imx7-media-csi.c @@ -168,6 +168,7 @@ #define IMX7_CSI_VIDEO_EOF_TIMEOUT 2000 #define IMX7_CSI_DEF_MBUS_CODE MEDIA_BUS_FMT_UYVY8_2X8 +#define IMX7_CSI_DEF_PIX_FORMAT V4L2_PIX_FMT_UYVY #define IMX7_CSI_DEF_PIX_WIDTH 640 #define IMX7_CSI_DEF_PIX_HEIGHT 480 @@ -806,8 +807,9 @@ static irqreturn_t imx7_csi_irq_handler(int irq, void *data) #define IMX_BUS_FMTS(fmt...) (const u32[]) {fmt, 0} /* - * List of supported pixel formats for the subdevs. Keep MEDIA_BUS_FMT_UYVY8_2X8 - * first to match IMX7_CSI_DEF_MBUS_CODE. + * List of supported pixel formats for the subdevs. Keep V4L2_PIX_FMT_UYVY and + * MEDIA_BUS_FMT_UYVY8_2X8 first to match IMX7_CSI_DEF_PIX_FORMAT and + * IMX7_CSI_DEF_MBUS_CODE. */ static const struct imx7_csi_pixfmt pixel_formats[] = { /*** YUV formats start here ***/ @@ -1131,7 +1133,7 @@ __imx7_csi_video_try_fmt(struct v4l2_pix_format *pixfmt, */ cc = imx7_csi_find_pixel_format(pixfmt->pixelformat); if (!cc) { - imx7_csi_enum_pixel_formats(&pixfmt->pixelformat, 0, 0); + pixfmt->pixelformat = IMX7_CSI_DEF_PIX_FORMAT; cc = imx7_csi_find_pixel_format(pixfmt->pixelformat); } |