media: atmel: atmel-isc: specialize max width and max height

Move the max width and max height constants to the product specific driver
and have them in the device struct.

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>

diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
index 02f1d1c..ed0048e 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isc-base.c
+++ b/drivers/media/platform/atmel/atmel-isc-base.c
@@ -1216,8 +1216,8 @@ static void isc_try_fse(struct isc_device *isc,
         * just use the maximum ISC can receive.
         */
        if (ret) {
-               pad_cfg->try_crop.width = ISC_MAX_SUPPORT_WIDTH;
-               pad_cfg->try_crop.height = ISC_MAX_SUPPORT_HEIGHT;
+               pad_cfg->try_crop.width = isc->max_width;
+               pad_cfg->try_crop.height = isc->max_height;
        } else {
                pad_cfg->try_crop.width = fse.max_width;
                pad_cfg->try_crop.height = fse.max_height;
@@ -1294,10 +1294,10 @@ static int isc_try_fmt(struct isc_device *isc, struct v4l2_format *f,
        isc->try_config.sd_format = sd_fmt;
 
        /* 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;
+       if (pixfmt->width > isc->max_width)
+               pixfmt->width = isc->max_width;
+       if (pixfmt->height > isc->max_height)
+               pixfmt->height = isc->max_height;
 
        /*
         * The mbus format is the one the subdev outputs.
@@ -1339,10 +1339,10 @@ 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;
+       if (pixfmt->width > isc->max_width)
+               pixfmt->width = isc->max_width;
+       if (pixfmt->height > isc->max_height)
+               pixfmt->height = isc->max_height;
 
        pixfmt->field = V4L2_FIELD_NONE;
        pixfmt->bytesperline = (pixfmt->width * isc->try_config.bpp) >> 3;
@@ -1380,10 +1380,10 @@ static int isc_set_fmt(struct isc_device *isc, struct v4l2_format *f)
                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;
+       if (f->fmt.pix.width > isc->max_width)
+               f->fmt.pix.width = isc->max_width;
+       if (f->fmt.pix.height > isc->max_height)
+               f->fmt.pix.height = isc->max_height;
 
        isc->fmt = *f;
 

diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
index 8d81d99..6becc6c 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isc.h
+++ b/drivers/media/platform/atmel/atmel-isc.h
@@ -10,9 +10,6 @@
  */
 #ifndef _ATMEL_ISC_H_
 
-#define ISC_MAX_SUPPORT_WIDTH   2592
-#define ISC_MAX_SUPPORT_HEIGHT  1944
-
 #define ISC_CLK_MAX_DIV                255
 
 enum isc_clk_id {
@@ -191,6 +188,9 @@ struct isc_ctrls {
  * @gamma_table:       pointer to the table with gamma values, has
  *                     gamma_max sets of GAMMA_ENTRIES entries each
  * @gamma_max:         maximum number of sets of inside the gamma_table
+ *
+ * @max_width:         maximum frame width, dependent on the internal RAM
+ * @max_height:                maximum frame height, dependent on the internal RAM
  */
 struct isc_device {
        struct regmap           *regmap;
@@ -254,6 +254,9 @@ struct isc_device {
        /* pointer to the defined gamma table */
        const u32       (*gamma_table)[GAMMA_ENTRIES];
        u32             gamma_max;
+
+       u32             max_width;
+       u32             max_height;
 };
 
 extern struct isc_format formats_list[];

diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
index 7e94db0..72112e0 100644 (file)
--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
@@ -49,8 +49,8 @@
 #include "atmel-isc-regs.h"
 #include "atmel-isc.h"
 
-#define ISC_MAX_SUPPORT_WIDTH   2592
-#define ISC_MAX_SUPPORT_HEIGHT  1944
+#define ISC_SAMA5D2_MAX_SUPPORT_WIDTH   2592
+#define ISC_SAMA5D2_MAX_SUPPORT_HEIGHT  1944
 
 #define ISC_CLK_MAX_DIV                255
 
@@ -195,6 +195,9 @@ static int atmel_isc_probe(struct platform_device *pdev)
        isc->gamma_table = isc_sama5d2_gamma_table;
        isc->gamma_max = 2;
 
+       isc->max_width = ISC_SAMA5D2_MAX_SUPPORT_WIDTH;
+       isc->max_height = ISC_SAMA5D2_MAX_SUPPORT_HEIGHT;
+
        ret = isc_pipeline_init(isc);
        if (ret)
                return ret;