Commit 649920af authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab

media: atomisp: Remove res_overflow parameter from atomisp_try_fmt()

The only remaining caller of atomisp_try_fmt() always passes NULL
for the res_overflow parameter. Drop it and simplify atomisp_try_fmt().
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 5c3213e9
...@@ -3881,8 +3881,7 @@ static void __atomisp_init_stream_info(u16 stream_index, ...@@ -3881,8 +3881,7 @@ static void __atomisp_init_stream_info(u16 stream_index,
} }
/* This function looks up the closest available resolution. */ /* This function looks up the closest available resolution. */
int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f, int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f)
bool *res_overflow)
{ {
struct atomisp_device *isp = video_get_drvdata(vdev); struct atomisp_device *isp = video_get_drvdata(vdev);
struct atomisp_sub_device *asd = atomisp_to_video_pipe(vdev)->asd; struct atomisp_sub_device *asd = atomisp_to_video_pipe(vdev)->asd;
...@@ -3940,6 +3939,8 @@ int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f, ...@@ -3940,6 +3939,8 @@ int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f,
} }
f->pixelformat = fmt->pixelformat; f->pixelformat = fmt->pixelformat;
f->width = format.format.width;
f->height = format.format.height;
/* /*
* If the format is jpeg or custom RAW, then the width and height will * If the format is jpeg or custom RAW, then the width and height will
...@@ -3948,22 +3949,8 @@ int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f, ...@@ -3948,22 +3949,8 @@ int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f,
* the sensor driver. * the sensor driver.
*/ */
if (f->pixelformat == V4L2_PIX_FMT_JPEG || if (f->pixelformat == V4L2_PIX_FMT_JPEG ||
f->pixelformat == V4L2_PIX_FMT_CUSTOM_M10MO_RAW) { f->pixelformat == V4L2_PIX_FMT_CUSTOM_M10MO_RAW)
f->width = format.format.width;
f->height = format.format.height;
return 0; return 0;
}
if (!res_overflow || (format.format.width < f->width &&
format.format.height < f->height)) {
f->width = format.format.width;
f->height = format.format.height;
/* Set the flag when resolution requested is
* beyond the max value supported by sensor
*/
if (res_overflow)
*res_overflow = true;
}
/* app vs isp */ /* app vs isp */
f->width = rounddown(clamp_t(u32, f->width, ATOM_ISP_MIN_WIDTH, f->width = rounddown(clamp_t(u32, f->width, ATOM_ISP_MIN_WIDTH,
......
...@@ -259,8 +259,7 @@ int atomisp_compare_grid(struct atomisp_sub_device *asd, ...@@ -259,8 +259,7 @@ int atomisp_compare_grid(struct atomisp_sub_device *asd,
struct atomisp_grid_info *atomgrid); struct atomisp_grid_info *atomgrid);
/* This function looks up the closest available resolution. */ /* This function looks up the closest available resolution. */
int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f, int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f);
bool *res_overflow);
int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f); int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f);
......
...@@ -896,7 +896,7 @@ static int atomisp_try_fmt_cap(struct file *file, void *fh, ...@@ -896,7 +896,7 @@ static int atomisp_try_fmt_cap(struct file *file, void *fh,
f->fmt.pix.width += pad_w; f->fmt.pix.width += pad_w;
f->fmt.pix.height += pad_h; f->fmt.pix.height += pad_h;
ret = atomisp_try_fmt(vdev, &f->fmt.pix, NULL); ret = atomisp_try_fmt(vdev, &f->fmt.pix);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment