| Message ID | 20170427224203.14611-7-niklas.soderlund+renesas@ragnatech.se (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Niklas, Another easy one. On 27/04/17 23:41, Niklas Söderlund wrote: > 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: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > --- > drivers/media/platform/rcar-vin/rcar-core.c | 6 ++++++ > drivers/media/platform/rcar-vin/rcar-v4l2.c | 6 ++---- > drivers/media/platform/rcar-vin/rcar-vin.h | 6 ++++++ > 3 files changed, 14 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c > index ec1eb723d401fda2..998617711f1ad045 100644 > --- a/drivers/media/platform/rcar-vin/rcar-core.c > +++ b/drivers/media/platform/rcar-vin/rcar-core.c > @@ -257,14 +257,20 @@ static int rvin_digital_graph_init(struct rvin_dev *vin) > > static const struct rvin_info rcar_info_h1 = { > .chip = RCAR_H1, > + .max_width = 2048, > + .max_height = 2048, > }; > > static const struct rvin_info rcar_info_m1 = { > .chip = RCAR_M1, > + .max_width = 2048, > + .max_height = 2048, > }; > > static const struct rvin_info rcar_info_gen2 = { > .chip = RCAR_GEN2, > + .max_width = 2048, > + .max_height = 2048, > }; > > static const struct of_device_id rvin_of_id_table[] = { > diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c > index 7deca15d22b4d6e3..1b364f359ff4b5ed 100644 > --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c > +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c > @@ -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 > @@ -264,8 +262,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)); > diff --git a/drivers/media/platform/rcar-vin/rcar-vin.h b/drivers/media/platform/rcar-vin/rcar-vin.h > index c07b4a6893440a6a..32d9d130dd6e2e44 100644 > --- a/drivers/media/platform/rcar-vin/rcar-vin.h > +++ b/drivers/media/platform/rcar-vin/rcar-vin.h > @@ -91,9 +91,15 @@ struct rvin_graph_entity { > /** > * struct rvin_info- Information about the particular VIN implementation > * @chip: type of VIN chip > + * > + * max_width: max input width the VIN supports > + * max_height: max input height the VIN supports > */ > struct rvin_info { > enum chip_id chip; > + > + unsigned int max_width; > + unsigned int max_height; > }; > > /** >
diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c index ec1eb723d401fda2..998617711f1ad045 100644 --- a/drivers/media/platform/rcar-vin/rcar-core.c +++ b/drivers/media/platform/rcar-vin/rcar-core.c @@ -257,14 +257,20 @@ static int rvin_digital_graph_init(struct rvin_dev *vin) static const struct rvin_info rcar_info_h1 = { .chip = RCAR_H1, + .max_width = 2048, + .max_height = 2048, }; static const struct rvin_info rcar_info_m1 = { .chip = RCAR_M1, + .max_width = 2048, + .max_height = 2048, }; static const struct rvin_info rcar_info_gen2 = { .chip = RCAR_GEN2, + .max_width = 2048, + .max_height = 2048, }; static const struct of_device_id rvin_of_id_table[] = { diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c index 7deca15d22b4d6e3..1b364f359ff4b5ed 100644 --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c @@ -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 @@ -264,8 +262,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)); diff --git a/drivers/media/platform/rcar-vin/rcar-vin.h b/drivers/media/platform/rcar-vin/rcar-vin.h index c07b4a6893440a6a..32d9d130dd6e2e44 100644 --- a/drivers/media/platform/rcar-vin/rcar-vin.h +++ b/drivers/media/platform/rcar-vin/rcar-vin.h @@ -91,9 +91,15 @@ struct rvin_graph_entity { /** * struct rvin_info- Information about the particular VIN implementation * @chip: type of VIN chip + * + * max_width: max input width the VIN supports + * max_height: max input height the VIN supports */ struct rvin_info { enum chip_id chip; + + unsigned int max_width; + unsigned int max_height; }; /**
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: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> --- drivers/media/platform/rcar-vin/rcar-core.c | 6 ++++++ drivers/media/platform/rcar-vin/rcar-v4l2.c | 6 ++---- drivers/media/platform/rcar-vin/rcar-vin.h | 6 ++++++ 3 files changed, 14 insertions(+), 4 deletions(-)