Commit 16cdb7d3 authored by Niklas Söderlund's avatar Niklas Söderlund Committed by Mauro Carvalho Chehab

media: rcar-vin: move max width and height information to chip information

On Gen3 the max supported width and height will be different from Gen2.
Move the limits to the struct rvin_info to prepare for Gen3 support.
Signed-off-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent bb3ed3fd
......@@ -243,14 +243,20 @@ static int rvin_digital_graph_init(struct rvin_dev *vin)
static const struct rvin_info rcar_info_h1 = {
.model = RCAR_H1,
.max_width = 2048,
.max_height = 2048,
};
static const struct rvin_info rcar_info_m1 = {
.model = RCAR_M1,
.max_width = 2048,
.max_height = 2048,
};
static const struct rvin_info rcar_info_gen2 = {
.model = RCAR_GEN2,
.max_width = 2048,
.max_height = 2048,
};
static const struct of_device_id rvin_of_id_table[] = {
......
......@@ -23,8 +23,6 @@
#include "rcar-vin.h"
#define RVIN_DEFAULT_FORMAT V4L2_PIX_FMT_YUYV
#define RVIN_MAX_WIDTH 2048
#define RVIN_MAX_HEIGHT 2048
/* -----------------------------------------------------------------------------
* Format Conversions
......@@ -258,8 +256,8 @@ static int __rvin_try_format(struct rvin_dev *vin,
walign = vin->format.pixelformat == V4L2_PIX_FMT_NV16 ? 5 : 1;
/* Limit to VIN capabilities */
v4l_bound_align_image(&pix->width, 2, RVIN_MAX_WIDTH, walign,
&pix->height, 4, RVIN_MAX_HEIGHT, 2, 0);
v4l_bound_align_image(&pix->width, 2, vin->info->max_width, walign,
&pix->height, 4, vin->info->max_height, 2, 0);
pix->bytesperline = max_t(u32, pix->bytesperline,
rvin_format_bytesperline(pix));
......
......@@ -89,9 +89,14 @@ struct rvin_graph_entity {
/**
* struct rvin_info - Information about the particular VIN implementation
* @model: VIN model
* @max_width: max input width the VIN supports
* @max_height: max input height the VIN supports
*/
struct rvin_info {
enum model_id model;
unsigned int max_width;
unsigned int max_height;
};
/**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment