mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-04 06:49:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

media: ov5640: Restrict sizes to mbus code

Browse Source 
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)

Restrict the frame sizes enumerations to the above constraints.

While at it, make sure the fse->mbus_code parameter is valid, and return
-EINVAL if it's not.

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>
This commit is contained in:
Jacopo Mondi
2022-05-13 15:14:13 +01:00
committed by Mauro Carvalho Chehab
parent 6ac98b41b4
commit 7dcb3a2f1f
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/media/i2c/ov5640.c
View File

@@ -3474,14 +3474,28 @@ static int ov5640_enum_frame_size(struct v4l2_subdev *sd,
struct v4l2_subdev_state *sd_state,
struct v4l2_subdev_frame_size_enum *fse)
{
u32 bpp = ov5640_code_to_bpp(fse->code);
unsigned int index = fse->index;
if (fse->pad != 0)
return -EINVAL;
if (fse->index >= OV5640_NUM_MODES)
if (!bpp)
return -EINVAL;
fse->min_width = ov5640_mode_data[fse->index].width;
/* Only low-resolution modes are supported for 24bpp formats. */
if (bpp == 24 && index >= OV5640_MODE_720P_1280_720)
return -EINVAL;
/* FIXME: Low resolution modes don't work in 8bpp formats. */
if (bpp == 8)
index += OV5640_MODE_720P_1280_720;
if (index >= OV5640_NUM_MODES)
return -EINVAL;
fse->min_width = ov5640_mode_data[index].width;
fse->max_width = fse->min_width;
fse->min_height = ov5640_mode_data[fse->index].height;
fse->min_height = ov5640_mode_data[index].height;
fse->max_height = fse->min_height;
return 0;