[media] v4l: vsp1: Update WPF and LIF maximum sizes for Gen3

The maximum image size supported by the WPF is 2048x2048 on Gen2 and
8190x8190 on Gen3. Update the code accordingly, and fix the maximum LIF
size for both Gen2 and Gen3.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/platform/vsp1/vsp1_lif.c b/drivers/media/platform/vsp1/vsp1_lif.c
index 579e142b4e94d828e85fb436910fed6ea10fb541..0217393f22dfc395539dc4b0caa58f8bed604606 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_lif.c
+++ b/drivers/media/platform/vsp1/vsp1_lif.c
@@ -21,7 +21,7 @@
 #include "vsp1_lif.h"
 
 #define LIF_MIN_SIZE                           2U
-#define LIF_MAX_SIZE                           2048U
+#define LIF_MAX_SIZE                           8190U
 
 /* -----------------------------------------------------------------------------
  * Device Access

diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c b/drivers/media/platform/vsp1/vsp1_wpf.c
index ce1d0b4094dba544db5104363c810568faedf1d2..6c91eaa35e75c68ed11437795d4ba0565aace8df 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_wpf.c
+++ b/drivers/media/platform/vsp1/vsp1_wpf.c
@@ -21,8 +21,10 @@
 #include "vsp1_rwpf.h"
 #include "vsp1_video.h"
 
-#define WPF_MAX_WIDTH                          2048
-#define WPF_MAX_HEIGHT                         2048
+#define WPF_GEN2_MAX_WIDTH                     2048U
+#define WPF_GEN2_MAX_HEIGHT                    2048U
+#define WPF_GEN3_MAX_WIDTH                     8190U
+#define WPF_GEN3_MAX_HEIGHT                    8190U
 
 /* -----------------------------------------------------------------------------
  * Device Access
@@ -201,8 +203,13 @@ struct vsp1_rwpf *vsp1_wpf_create(struct vsp1_device *vsp1, unsigned int index)
        if (wpf == NULL)
                return ERR_PTR(-ENOMEM);
 
-       wpf->max_width = WPF_MAX_WIDTH;
-       wpf->max_height = WPF_MAX_HEIGHT;
+       if (vsp1->info->gen == 2) {
+               wpf->max_width = WPF_GEN2_MAX_WIDTH;
+               wpf->max_height = WPF_GEN2_MAX_HEIGHT;
+       } else {
+               wpf->max_width = WPF_GEN3_MAX_WIDTH;
+               wpf->max_height = WPF_GEN3_MAX_HEIGHT;
+       }
 
        wpf->entity.ops = &wpf_entity_ops;
        wpf->entity.type = VSP1_ENTITY_WPF;