46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From de8fa25cdf3726c83ac0d7b3b1e28bcb6334aadd Mon Sep 17 00:00:00 2001
|
|
From: Eugen Hristev <eugen.hristev@microchip.com>
|
|
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 <eugen.hristev@microchip.com>
|
|
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
|
|
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
|
|
---
|
|
drivers/media/platform/atmel/atmel-isc-base.c | 12 ++++++++++++
|
|
1 file changed, 12 insertions(+)
|
|
|
|
--- 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
|
|
|
|
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
|
|
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 &&
|