media: rkisp1: Adapt to different SoCs having different size limits

- RK3399 has input/output limit of main path 4416 x 3312
- PX30 has input/output limit of main path 3264 x 2448
- i.MX8MP has input/output limit of main path 4096 x 3072

Use rkisp1_info struct to encode the limits.

Signed-off-by: Ondrej Jirman <megi@xff.cz>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
index 26573f6ae57550d9502c41ac7e1931868f68d4a6..3ce7d477e455af969a89348616d336e378b69399 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
@@ -33,9 +33,10 @@ struct regmap;
 #define RKISP1_ISP_SD_SRC                      BIT(0)
 #define RKISP1_ISP_SD_SINK                     BIT(1)
 
-/* min and max values for the widths and heights of the entities */
-#define RKISP1_ISP_MAX_WIDTH                   4032
-#define RKISP1_ISP_MAX_HEIGHT                  3024
+/*
+ * Minimum values for the width and height of entities. The maximum values are
+ * model-specific and stored in the rkisp1_info structure.
+ */
 #define RKISP1_ISP_MIN_WIDTH                   32
 #define RKISP1_ISP_MIN_HEIGHT                  32
 
@@ -140,6 +141,8 @@ enum rkisp1_feature {
  * @isr_size: number of entries in the @isrs array
  * @isp_ver: ISP version
  * @features: bitmask of rkisp1_feature features implemented by the ISP
+ * @max_width: maximum input frame width
+ * @max_height: maximum input frame height
  *
  * This structure contains information about the ISP specific to a particular
  * ISP model, version, or integration in a particular SoC.
@@ -151,6 +154,8 @@ struct rkisp1_info {
        unsigned int isr_size;
        enum rkisp1_cif_isp_version isp_ver;
        unsigned int features;
+       unsigned int max_width;
+       unsigned int max_height;
 };
 
 /*

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-csi.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-csi.c
index 4202642e052392a946761ecb76d3cfa771956e07..841e58c20f7fcb484643138627413425a049d1fa 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-csi.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-csi.c
@@ -307,6 +307,7 @@ static int rkisp1_csi_set_fmt(struct v4l2_subdev *sd,
                              struct v4l2_subdev_state *sd_state,
                              struct v4l2_subdev_format *fmt)
 {
+       struct rkisp1_csi *csi = to_rkisp1_csi(sd);
        const struct rkisp1_mbus_info *mbus_info;
        struct v4l2_mbus_framefmt *sink_fmt, *src_fmt;
 
@@ -326,10 +327,10 @@ static int rkisp1_csi_set_fmt(struct v4l2_subdev *sd,
 
        sink_fmt->width = clamp_t(u32, fmt->format.width,
                                  RKISP1_ISP_MIN_WIDTH,
-                                 RKISP1_ISP_MAX_WIDTH);
+                                 csi->rkisp1->info->max_width);
        sink_fmt->height = clamp_t(u32, fmt->format.height,
                                   RKISP1_ISP_MIN_HEIGHT,
-                                  RKISP1_ISP_MAX_HEIGHT);
+                                  csi->rkisp1->info->max_height);
 
        fmt->format = *sink_fmt;
 

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
index bb0202386c70173cdd59f296bff7c5a72421877d..0535ce57e86230c30b9a06f6b3fd6848b675523b 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
@@ -510,6 +510,8 @@ static const struct rkisp1_info px30_isp_info = {
        .features = RKISP1_FEATURE_MIPI_CSI2
                  | RKISP1_FEATURE_SELF_PATH
                  | RKISP1_FEATURE_DUAL_CROP,
+       .max_width = 3264,
+       .max_height = 2448,
 };
 
 static const char * const rk3399_isp_clks[] = {
@@ -531,6 +533,8 @@ static const struct rkisp1_info rk3399_isp_info = {
        .features = RKISP1_FEATURE_MIPI_CSI2
                  | RKISP1_FEATURE_SELF_PATH
                  | RKISP1_FEATURE_DUAL_CROP,
+       .max_width = 4416,
+       .max_height = 3312,
 };
 
 static const char * const imx8mp_isp_clks[] = {
@@ -551,6 +555,8 @@ static const struct rkisp1_info imx8mp_isp_info = {
        .isp_ver = RKISP1_V_IMX8MP,
        .features = RKISP1_FEATURE_MAIN_STRIDE
                  | RKISP1_FEATURE_DMA_34BIT,
+       .max_width = 4096,
+       .max_height = 3072,
 };
 
 static const struct of_device_id rkisp1_of_match[] = {

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
index 91301d17d356c48cb01ccf59ddfbb66a4f6130f0..d9491721182826a8d29d3f0dbe6c114472ecce3c 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
@@ -517,6 +517,7 @@ static int rkisp1_isp_enum_frame_size(struct v4l2_subdev *sd,
                                      struct v4l2_subdev_state *sd_state,
                                      struct v4l2_subdev_frame_size_enum *fse)
 {
+       struct rkisp1_isp *isp = to_rkisp1_isp(sd);
        const struct rkisp1_mbus_info *mbus_info;
 
        if (fse->pad == RKISP1_ISP_PAD_SINK_PARAMS ||
@@ -539,9 +540,9 @@ static int rkisp1_isp_enum_frame_size(struct v4l2_subdev *sd,
                return -EINVAL;
 
        fse->min_width = RKISP1_ISP_MIN_WIDTH;
-       fse->max_width = RKISP1_ISP_MAX_WIDTH;
+       fse->max_width = isp->rkisp1->info->max_width;
        fse->min_height = RKISP1_ISP_MIN_HEIGHT;
-       fse->max_height = RKISP1_ISP_MAX_HEIGHT;
+       fse->max_height = isp->rkisp1->info->max_height;
 
        return 0;
 }
@@ -772,10 +773,10 @@ static void rkisp1_isp_set_sink_fmt(struct rkisp1_isp *isp,
 
        sink_fmt->width = clamp_t(u32, format->width,
                                  RKISP1_ISP_MIN_WIDTH,
-                                 RKISP1_ISP_MAX_WIDTH);
+                                 isp->rkisp1->info->max_width);
        sink_fmt->height = clamp_t(u32, format->height,
                                   RKISP1_ISP_MIN_HEIGHT,
-                                  RKISP1_ISP_MAX_HEIGHT);
+                                  isp->rkisp1->info->max_height);
 
        /*
         * Adjust the color space fields. Accept any color primaries and

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
index 1fa991227fa9042a18822c62de50ab7e84d8efad..f073e72a0d3732814832b0c4b306e7a4a1ad9d4a 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
@@ -494,10 +494,10 @@ static void rkisp1_rsz_set_sink_fmt(struct rkisp1_resizer *rsz,
 
        sink_fmt->width = clamp_t(u32, format->width,
                                  RKISP1_ISP_MIN_WIDTH,
-                                 RKISP1_ISP_MAX_WIDTH);
+                                 rsz->rkisp1->info->max_width);
        sink_fmt->height = clamp_t(u32, format->height,
                                   RKISP1_ISP_MIN_HEIGHT,
-                                  RKISP1_ISP_MAX_HEIGHT);
+                                  rsz->rkisp1->info->max_height);
 
        /*
         * Adjust the color space fields. Accept any color primaries and