mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-30 18:10:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

media: atomisp: ov2680: Drop v4l2_find_nearest_size() call from set_fmt()

Browse Source 
Since we now calculate timings baded on the desired width and height,
any width and height are valid as long as they don't exceed the sensor's
dimensions.

Drop the v4l2_find_nearest_size() call and instead clamp the requested
width and height.

Reviewed-by: Andy Shevchenko <andy@kernel.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Hans de Goede
2023-01-13 16:01:40 +01:00
committed by Mauro Carvalho Chehab
parent a6fc86ed57
commit f4ed8e3ba6
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
View File

@@ -510,17 +510,14 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd,
struct ov2680_device *dev = to_ov2680_sensor(sd);
struct i2c_client *client = v4l2_get_subdevdata(sd);
struct v4l2_mbus_framefmt *fmt;
struct ov2680_resolution *res;
unsigned int width, height;
int ret = 0;
res = v4l2_find_nearest_size(ov2680_res_preview, ARRAY_SIZE(ov2680_res_preview),
width, height,
format->format.width, format->format.height);
if (!res)
res = &ov2680_res_preview[N_RES_PREVIEW - 1];
width = min_t(unsigned int, ALIGN(format->format.width, 2), OV2680_NATIVE_WIDTH);
height = min_t(unsigned int, ALIGN(format->format.height, 2), OV2680_NATIVE_HEIGHT);
fmt = __ov2680_get_pad_format(dev, sd_state, format->pad, format->which);
ov2680_fill_format(dev, fmt, res->width, res->height);
ov2680_fill_format(dev, fmt, width, height);
format->format = *fmt;