| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950 |
- From de8fa25cdf3726c83ac0d7b3b1e28bcb6334aadd Mon Sep 17 00:00:00 2001
- From: Eugen Hristev <[email protected]>
- Date: Tue, 13 Apr 2021 12:57:01 +0200
- Subject: [PATCH 159/247] media: atmel: atmel-isc: add checks for limiting
- frame sizes
- When calling the subdev, certain subdev drivers will overwrite the
- frame size and adding sizes which are beyond the ISC's capabilities.
- Thus we need to ensure the frame size is cropped to the maximum caps.
- Signed-off-by: Eugen Hristev <[email protected]>
- Signed-off-by: Hans Verkuil <[email protected]>
- Signed-off-by: Mauro Carvalho Chehab <[email protected]>
- ---
- drivers/media/platform/atmel/atmel-isc-base.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
- diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
- index d987a8891bd9..02f1d1c6b06e 100644
- --- a/drivers/media/platform/atmel/atmel-isc-base.c
- +++ b/drivers/media/platform/atmel/atmel-isc-base.c
- @@ -1338,6 +1338,12 @@ static int isc_try_fmt(struct isc_device *isc, struct v4l2_format *f,
-
- v4l2_fill_pix_format(pixfmt, &format.format);
-
- + /* Limit to Atmel ISC hardware capabilities */
- + if (pixfmt->width > ISC_MAX_SUPPORT_WIDTH)
- + pixfmt->width = ISC_MAX_SUPPORT_WIDTH;
- + if (pixfmt->height > ISC_MAX_SUPPORT_HEIGHT)
- + pixfmt->height = ISC_MAX_SUPPORT_HEIGHT;
- +
- pixfmt->field = V4L2_FIELD_NONE;
- pixfmt->bytesperline = (pixfmt->width * isc->try_config.bpp) >> 3;
- pixfmt->sizeimage = pixfmt->bytesperline * pixfmt->height;
- @@ -1373,6 +1379,12 @@ static int isc_set_fmt(struct isc_device *isc, struct v4l2_format *f)
- if (ret < 0)
- return ret;
-
- + /* Limit to Atmel ISC hardware capabilities */
- + if (pixfmt->width > ISC_MAX_SUPPORT_WIDTH)
- + pixfmt->width = ISC_MAX_SUPPORT_WIDTH;
- + if (pixfmt->height > ISC_MAX_SUPPORT_HEIGHT)
- + pixfmt->height = ISC_MAX_SUPPORT_HEIGHT;
- +
- isc->fmt = *f;
-
- if (isc->try_config.sd_format && isc->config.sd_format &&
- --
- 2.32.0
|
