media: ov5640: Adjust format to bpp in s_fmt

The ov5640 driver supports different sizes for different mbus_codes.
In particular:

- 8bpp modes: high resolution sizes (>= 1280x720)
- 16bpp modes: all sizes
- 24bpp modes: low resolutions sizes (< 1280x720)

Adjust the image sizes according to the above constraints.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index 125ada9ae5fcc788bb8284db1d3d44a5d68d8d96..096e2ee924aa7b37e19c1dfd2a42c54af09d08c1 100644 (file)
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -2698,6 +2698,7 @@ static int ov5640_try_fmt_internal(struct v4l2_subdev *sd,
                                   enum ov5640_frame_rate fr,
                                   const struct ov5640_mode_info **new_mode)
 {
+       unsigned int bpp = ov5640_code_to_bpp(fmt->code);
        struct ov5640_dev *sensor = to_ov5640_dev(sd);
        const struct ov5640_mode_info *mode;
        int i;
@@ -2705,6 +2706,17 @@ static int ov5640_try_fmt_internal(struct v4l2_subdev *sd,
        mode = ov5640_find_mode(sensor, fmt->width, fmt->height, true);
        if (!mode)
                return -EINVAL;
+
+       /*
+        * Adjust mode according to bpp:
+        * - 8bpp modes work for resolution >= 1280x720
+        * - 24bpp modes work resolution < 1280x720
+        */
+       if (bpp == 8 && mode->width < 1280)
+               mode = &ov5640_mode_data[OV5640_MODE_720P_1280_720];
+       else if (bpp == 24 && mode->width > 1024)
+               mode = &ov5640_mode_data[OV5640_MODE_XGA_1024_768];
+
        fmt->width = mode->width;
        fmt->height = mode->height;