Re: [PATCH v6 07/13] media: tvp5150: add FORMAT_TRY support for get/set selection handlers
Hi Mauro, On 19-05-14 15:48, Mauro Carvalho Chehab wrote: > Em Mon, 15 Apr 2019 14:44:07 +0200 > Marco Felsch escreveu: > > > Since commit 10d5509c8d50 ("[media] v4l2: remove g/s_crop from video ops") > > the 'which' field for set/get_selection must be FORMAT_ACTIVE. There is > > no way to try different selections. The patch adds a helper function to > > select the correct selection memory space (sub-device file handle or > > driver state) which will be set/returned. > > > > The TVP5150 AVID will be updated if the 'which' field is FORMAT_ACTIVE > > and the requested selection rectangle differs from the already set one. > > > > Signed-off-by: Marco Felsch > > --- > > Changelog: > > > > v5: > > - handle stub for v4l2_subdev_get_try_crop() internal since commit > >("media: v4l2-subdev: add stubs for v4l2_subdev_get_try_*") > >isn't anymore part of this series. > > - add error handling of __tvp5150_get_pad_crop() > > v4: > > - fix merge conflict due to rebase on top of media-tree/master > > - __tvp5150_get_pad_crop(): cosmetic alignment fixes > > > > drivers/media/i2c/tvp5150.c | 130 ++-- > > 1 file changed, 96 insertions(+), 34 deletions(-) > > > > diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c > > index 4e3228b2ccbc..9331609425bf 100644 > > --- a/drivers/media/i2c/tvp5150.c > > +++ b/drivers/media/i2c/tvp5150.c > > @@ -19,6 +19,7 @@ > > #include > > #include > > #include > > +#include > > > > #include "tvp5150_reg.h" > > > > @@ -997,20 +998,48 @@ static void tvp5150_set_default(v4l2_std_id std, > > struct v4l2_rect *crop) > > crop->height = TVP5150_V_MAX_OTHERS; > > } > > > > +static struct v4l2_rect * > > +__tvp5150_get_pad_crop(struct tvp5150 *decoder, > > + struct v4l2_subdev_pad_config *cfg, unsigned int pad, > > + enum v4l2_subdev_format_whence which) > > +{ > > + switch (which) { > > + case V4L2_SUBDEV_FORMAT_TRY: > > +#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API) > > + return v4l2_subdev_get_try_crop(&decoder->sd, cfg, pad); > > +#else > > + return ERR_PTR(-ENOTTY); > > +#endif > > + case V4L2_SUBDEV_FORMAT_ACTIVE: > > + return &decoder->rect; > > + default: > > + return NULL; > > + } > > Same comments as Jacopo: use return ERR_PTR(-EINVAL) instead... I applied all comments from Jacopo. Thanks for the review. Regards, Marco > > > +} > > + > > static int tvp5150_fill_fmt(struct v4l2_subdev *sd, > > struct v4l2_subdev_pad_config *cfg, > > struct v4l2_subdev_format *format) > > { > > struct v4l2_mbus_framefmt *f; > > + struct v4l2_rect *__crop; > > struct tvp5150 *decoder = to_tvp5150(sd); > > > > if (!format || (format->pad != TVP5150_PAD_VID_OUT)) > > return -EINVAL; > > > > f = &format->format; > > + __crop = __tvp5150_get_pad_crop(decoder, cfg, format->pad, > > + format->which); > > + if (IS_ERR_OR_NULL(__crop)) { > > + if (!__crop) > > + return -EINVAL; > > + else > > + return PTR_ERR(__crop); > > And here, return PTR_ERR directly. Same at the similar case below. > > > + } > > > > - f->width = decoder->rect.width; > > - f->height = decoder->rect.height / 2; > > + f->width = __crop->width; > > + f->height = __crop->height / 2; > > > > f->code = TVP5150_MBUS_FMT; > > f->field = TVP5150_FIELD; > > @@ -1021,17 +1050,51 @@ static int tvp5150_fill_fmt(struct v4l2_subdev *sd, > > return 0; > > } > > > > +unsigned int tvp5150_get_hmax(struct v4l2_subdev *sd) > > +{ > > + struct tvp5150 *decoder = to_tvp5150(sd); > > + v4l2_std_id std; > > + > > + /* Calculate height based on current standard */ > > + if (decoder->norm == V4L2_STD_ALL) > > + std = tvp5150_read_std(sd); > > + else > > + std = decoder->norm; > > + > > + return (std & V4L2_STD_525_60) ? > > + TVP5150_V_MAX_525_60 : TVP5150_V_MAX_OTHERS; > > +} > > + > > +static inline void > > +__tvp5150_set_selection(struct v4l2_subdev *sd, struct v4l2_rect rect) > > +{ > > + struct tvp5150 *decoder = to_tvp5150(sd); > > + unsigned int hmax = tvp5150_get_hmax(sd); > > + > > + regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_START, rect.top); > > + regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_STOP, > > +rect.top + rect.height - hmax); > > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_MSB, > > +rect.left >> TVP5150_CROP_SHIFT); > > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_LSB, > > +rect.left | (1 << TVP5150_CROP_SHIFT)); > > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_STP_MSB, > > +(rect.left + rect.width - TVP5150_MAX_CROP_LEFT) >> > > +TVP5150_CROP_SHIFT); > > + regmap_write(decoder->regm
Re: [PATCH v6 07/13] media: tvp5150: add FORMAT_TRY support for get/set selection handlers
Hi Jacopo, On 19-05-06 15:36, Jacopo Mondi wrote: > Hi Marco, Sorry for the long time absence of this topic... > On Mon, Apr 15, 2019 at 02:44:07PM +0200, Marco Felsch wrote: > > Since commit 10d5509c8d50 ("[media] v4l2: remove g/s_crop from video ops") > > the 'which' field for set/get_selection must be FORMAT_ACTIVE. There is > > no way to try different selections. The patch adds a helper function to > > select the correct selection memory space (sub-device file handle or > > driver state) which will be set/returned. > > > > The TVP5150 AVID will be updated if the 'which' field is FORMAT_ACTIVE > > and the requested selection rectangle differs from the already set one. > > > > Signed-off-by: Marco Felsch > > --- > > Changelog: > > > > v5: > > - handle stub for v4l2_subdev_get_try_crop() internal since commit > >("media: v4l2-subdev: add stubs for v4l2_subdev_get_try_*") > >isn't anymore part of this series. > > - add error handling of __tvp5150_get_pad_crop() > > v4: > > - fix merge conflict due to rebase on top of media-tree/master > > - __tvp5150_get_pad_crop(): cosmetic alignment fixes > > > > drivers/media/i2c/tvp5150.c | 130 ++-- > > 1 file changed, 96 insertions(+), 34 deletions(-) > > > > diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c > > index 4e3228b2ccbc..9331609425bf 100644 > > --- a/drivers/media/i2c/tvp5150.c > > +++ b/drivers/media/i2c/tvp5150.c > > @@ -19,6 +19,7 @@ > > #include > > #include > > #include > > +#include > > > > #include "tvp5150_reg.h" > > > > @@ -997,20 +998,48 @@ static void tvp5150_set_default(v4l2_std_id std, > > struct v4l2_rect *crop) > > crop->height = TVP5150_V_MAX_OTHERS; > > } > > > > +static struct v4l2_rect * > > +__tvp5150_get_pad_crop(struct tvp5150 *decoder, > > + struct v4l2_subdev_pad_config *cfg, unsigned int pad, > > + enum v4l2_subdev_format_whence which) > > +{ > > + switch (which) { > > + case V4L2_SUBDEV_FORMAT_TRY: > > +#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API) > > + return v4l2_subdev_get_try_crop(&decoder->sd, cfg, pad); > > +#else > > + return ERR_PTR(-ENOTTY); > > +#endif > > + case V4L2_SUBDEV_FORMAT_ACTIVE: > > + return &decoder->rect; > > + default: > > + return NULL; > > Do you need this default case? Can you return -EINVAL so that... I will change that, thanks. > > > + } > > +} > > + > > static int tvp5150_fill_fmt(struct v4l2_subdev *sd, > > struct v4l2_subdev_pad_config *cfg, > > struct v4l2_subdev_format *format) > > { > > struct v4l2_mbus_framefmt *f; > > + struct v4l2_rect *__crop; > > struct tvp5150 *decoder = to_tvp5150(sd); > > > > if (!format || (format->pad != TVP5150_PAD_VID_OUT)) > > return -EINVAL; > > > > f = &format->format; > > + __crop = __tvp5150_get_pad_crop(decoder, cfg, format->pad, > > + format->which); > > + if (IS_ERR_OR_NULL(__crop)) { > > ... here you just need to check if (IS_ERR()) and return it? > > > + if (!__crop) > > + return -EINVAL; > > + else > > + return PTR_ERR(__crop); > > + } > > > > - f->width = decoder->rect.width; > > - f->height = decoder->rect.height / 2; > > + f->width = __crop->width; > > + f->height = __crop->height / 2; > > > > f->code = TVP5150_MBUS_FMT; > > f->field = TVP5150_FIELD; > > @@ -1021,17 +1050,51 @@ static int tvp5150_fill_fmt(struct v4l2_subdev *sd, > > return 0; > > } > > > > +unsigned int tvp5150_get_hmax(struct v4l2_subdev *sd) > > +{ > > + struct tvp5150 *decoder = to_tvp5150(sd); > > + v4l2_std_id std; > > + > > + /* Calculate height based on current standard */ > > + if (decoder->norm == V4L2_STD_ALL) > > + std = tvp5150_read_std(sd); > > + else > > + std = decoder->norm; > > + > > + return (std & V4L2_STD_525_60) ? > > + TVP5150_V_MAX_525_60 : TVP5150_V_MAX_OTHERS; > > +} > > + > > +static inline void > > +__tvp5150_set_selection(struct v4l2_subdev *sd, struct v4l2_rect rect) > > +{ > > + struct tvp5150 *decoder = to_tvp5150(sd); > > + unsigned int hmax = tvp5150_get_hmax(sd); > > + > > + regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_START, rect.top); > > + regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_STOP, > > +rect.top + rect.height - hmax); > > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_MSB, > > +rect.left >> TVP5150_CROP_SHIFT); > > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_LSB, > > +rect.left | (1 << TVP5150_CROP_SHIFT)); > > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_STP_MSB, > > +(rect.left + rect.width - TVP5150_MAX_CROP_LEFT) >> > > +TVP5150_CROP_SHIFT); > > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP
Re: [PATCH v6 07/13] media: tvp5150: add FORMAT_TRY support for get/set selection handlers
Em Mon, 15 Apr 2019 14:44:07 +0200 Marco Felsch escreveu: > Since commit 10d5509c8d50 ("[media] v4l2: remove g/s_crop from video ops") > the 'which' field for set/get_selection must be FORMAT_ACTIVE. There is > no way to try different selections. The patch adds a helper function to > select the correct selection memory space (sub-device file handle or > driver state) which will be set/returned. > > The TVP5150 AVID will be updated if the 'which' field is FORMAT_ACTIVE > and the requested selection rectangle differs from the already set one. > > Signed-off-by: Marco Felsch > --- > Changelog: > > v5: > - handle stub for v4l2_subdev_get_try_crop() internal since commit >("media: v4l2-subdev: add stubs for v4l2_subdev_get_try_*") >isn't anymore part of this series. > - add error handling of __tvp5150_get_pad_crop() > v4: > - fix merge conflict due to rebase on top of media-tree/master > - __tvp5150_get_pad_crop(): cosmetic alignment fixes > > drivers/media/i2c/tvp5150.c | 130 ++-- > 1 file changed, 96 insertions(+), 34 deletions(-) > > diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c > index 4e3228b2ccbc..9331609425bf 100644 > --- a/drivers/media/i2c/tvp5150.c > +++ b/drivers/media/i2c/tvp5150.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > > #include "tvp5150_reg.h" > > @@ -997,20 +998,48 @@ static void tvp5150_set_default(v4l2_std_id std, struct > v4l2_rect *crop) > crop->height = TVP5150_V_MAX_OTHERS; > } > > +static struct v4l2_rect * > +__tvp5150_get_pad_crop(struct tvp5150 *decoder, > +struct v4l2_subdev_pad_config *cfg, unsigned int pad, > +enum v4l2_subdev_format_whence which) > +{ > + switch (which) { > + case V4L2_SUBDEV_FORMAT_TRY: > +#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API) > + return v4l2_subdev_get_try_crop(&decoder->sd, cfg, pad); > +#else > + return ERR_PTR(-ENOTTY); > +#endif > + case V4L2_SUBDEV_FORMAT_ACTIVE: > + return &decoder->rect; > + default: > + return NULL; > + } Same comments as Jacopo: use return ERR_PTR(-EINVAL) instead... > +} > + > static int tvp5150_fill_fmt(struct v4l2_subdev *sd, > struct v4l2_subdev_pad_config *cfg, > struct v4l2_subdev_format *format) > { > struct v4l2_mbus_framefmt *f; > + struct v4l2_rect *__crop; > struct tvp5150 *decoder = to_tvp5150(sd); > > if (!format || (format->pad != TVP5150_PAD_VID_OUT)) > return -EINVAL; > > f = &format->format; > + __crop = __tvp5150_get_pad_crop(decoder, cfg, format->pad, > + format->which); > + if (IS_ERR_OR_NULL(__crop)) { > + if (!__crop) > + return -EINVAL; > + else > + return PTR_ERR(__crop); And here, return PTR_ERR directly. Same at the similar case below. > + } > > - f->width = decoder->rect.width; > - f->height = decoder->rect.height / 2; > + f->width = __crop->width; > + f->height = __crop->height / 2; > > f->code = TVP5150_MBUS_FMT; > f->field = TVP5150_FIELD; > @@ -1021,17 +1050,51 @@ static int tvp5150_fill_fmt(struct v4l2_subdev *sd, > return 0; > } > > +unsigned int tvp5150_get_hmax(struct v4l2_subdev *sd) > +{ > + struct tvp5150 *decoder = to_tvp5150(sd); > + v4l2_std_id std; > + > + /* Calculate height based on current standard */ > + if (decoder->norm == V4L2_STD_ALL) > + std = tvp5150_read_std(sd); > + else > + std = decoder->norm; > + > + return (std & V4L2_STD_525_60) ? > + TVP5150_V_MAX_525_60 : TVP5150_V_MAX_OTHERS; > +} > + > +static inline void > +__tvp5150_set_selection(struct v4l2_subdev *sd, struct v4l2_rect rect) > +{ > + struct tvp5150 *decoder = to_tvp5150(sd); > + unsigned int hmax = tvp5150_get_hmax(sd); > + > + regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_START, rect.top); > + regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_STOP, > + rect.top + rect.height - hmax); > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_MSB, > + rect.left >> TVP5150_CROP_SHIFT); > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_LSB, > + rect.left | (1 << TVP5150_CROP_SHIFT)); > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_STP_MSB, > + (rect.left + rect.width - TVP5150_MAX_CROP_LEFT) >> > + TVP5150_CROP_SHIFT); > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_STP_LSB, > + rect.left + rect.width - TVP5150_MAX_CROP_LEFT); > +} > + > static int tvp5150_set_selection(struct v4l2_subdev *sd, >struct v4l2_subdev_pad_config *cfg, >struct v4l2_subdev_
Re: [PATCH v6 07/13] media: tvp5150: add FORMAT_TRY support for get/set selection handlers
Hi Marco, On Mon, Apr 15, 2019 at 02:44:07PM +0200, Marco Felsch wrote: > Since commit 10d5509c8d50 ("[media] v4l2: remove g/s_crop from video ops") > the 'which' field for set/get_selection must be FORMAT_ACTIVE. There is > no way to try different selections. The patch adds a helper function to > select the correct selection memory space (sub-device file handle or > driver state) which will be set/returned. > > The TVP5150 AVID will be updated if the 'which' field is FORMAT_ACTIVE > and the requested selection rectangle differs from the already set one. > > Signed-off-by: Marco Felsch > --- > Changelog: > > v5: > - handle stub for v4l2_subdev_get_try_crop() internal since commit >("media: v4l2-subdev: add stubs for v4l2_subdev_get_try_*") >isn't anymore part of this series. > - add error handling of __tvp5150_get_pad_crop() > v4: > - fix merge conflict due to rebase on top of media-tree/master > - __tvp5150_get_pad_crop(): cosmetic alignment fixes > > drivers/media/i2c/tvp5150.c | 130 ++-- > 1 file changed, 96 insertions(+), 34 deletions(-) > > diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c > index 4e3228b2ccbc..9331609425bf 100644 > --- a/drivers/media/i2c/tvp5150.c > +++ b/drivers/media/i2c/tvp5150.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > > #include "tvp5150_reg.h" > > @@ -997,20 +998,48 @@ static void tvp5150_set_default(v4l2_std_id std, struct > v4l2_rect *crop) > crop->height = TVP5150_V_MAX_OTHERS; > } > > +static struct v4l2_rect * > +__tvp5150_get_pad_crop(struct tvp5150 *decoder, > +struct v4l2_subdev_pad_config *cfg, unsigned int pad, > +enum v4l2_subdev_format_whence which) > +{ > + switch (which) { > + case V4L2_SUBDEV_FORMAT_TRY: > +#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API) > + return v4l2_subdev_get_try_crop(&decoder->sd, cfg, pad); > +#else > + return ERR_PTR(-ENOTTY); > +#endif > + case V4L2_SUBDEV_FORMAT_ACTIVE: > + return &decoder->rect; > + default: > + return NULL; Do you need this default case? Can you return -EINVAL so that... > + } > +} > + > static int tvp5150_fill_fmt(struct v4l2_subdev *sd, > struct v4l2_subdev_pad_config *cfg, > struct v4l2_subdev_format *format) > { > struct v4l2_mbus_framefmt *f; > + struct v4l2_rect *__crop; > struct tvp5150 *decoder = to_tvp5150(sd); > > if (!format || (format->pad != TVP5150_PAD_VID_OUT)) > return -EINVAL; > > f = &format->format; > + __crop = __tvp5150_get_pad_crop(decoder, cfg, format->pad, > + format->which); > + if (IS_ERR_OR_NULL(__crop)) { ... here you just need to check if (IS_ERR()) and return it? > + if (!__crop) > + return -EINVAL; > + else > + return PTR_ERR(__crop); > + } > > - f->width = decoder->rect.width; > - f->height = decoder->rect.height / 2; > + f->width = __crop->width; > + f->height = __crop->height / 2; > > f->code = TVP5150_MBUS_FMT; > f->field = TVP5150_FIELD; > @@ -1021,17 +1050,51 @@ static int tvp5150_fill_fmt(struct v4l2_subdev *sd, > return 0; > } > > +unsigned int tvp5150_get_hmax(struct v4l2_subdev *sd) > +{ > + struct tvp5150 *decoder = to_tvp5150(sd); > + v4l2_std_id std; > + > + /* Calculate height based on current standard */ > + if (decoder->norm == V4L2_STD_ALL) > + std = tvp5150_read_std(sd); > + else > + std = decoder->norm; > + > + return (std & V4L2_STD_525_60) ? > + TVP5150_V_MAX_525_60 : TVP5150_V_MAX_OTHERS; > +} > + > +static inline void > +__tvp5150_set_selection(struct v4l2_subdev *sd, struct v4l2_rect rect) > +{ > + struct tvp5150 *decoder = to_tvp5150(sd); > + unsigned int hmax = tvp5150_get_hmax(sd); > + > + regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_START, rect.top); > + regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_STOP, > + rect.top + rect.height - hmax); > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_MSB, > + rect.left >> TVP5150_CROP_SHIFT); > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_LSB, > + rect.left | (1 << TVP5150_CROP_SHIFT)); > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_STP_MSB, > + (rect.left + rect.width - TVP5150_MAX_CROP_LEFT) >> > + TVP5150_CROP_SHIFT); > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_STP_LSB, > + rect.left + rect.width - TVP5150_MAX_CROP_LEFT); > +} > + > static int tvp5150_set_selection(struct v4l2_subdev *sd, >struct v4l2_subdev_pad_config *cfg, >struct v4l2_subdev_selection *se
[PATCH v6 07/13] media: tvp5150: add FORMAT_TRY support for get/set selection handlers
Since commit 10d5509c8d50 ("[media] v4l2: remove g/s_crop from video ops") the 'which' field for set/get_selection must be FORMAT_ACTIVE. There is no way to try different selections. The patch adds a helper function to select the correct selection memory space (sub-device file handle or driver state) which will be set/returned. The TVP5150 AVID will be updated if the 'which' field is FORMAT_ACTIVE and the requested selection rectangle differs from the already set one. Signed-off-by: Marco Felsch --- Changelog: v5: - handle stub for v4l2_subdev_get_try_crop() internal since commit ("media: v4l2-subdev: add stubs for v4l2_subdev_get_try_*") isn't anymore part of this series. - add error handling of __tvp5150_get_pad_crop() v4: - fix merge conflict due to rebase on top of media-tree/master - __tvp5150_get_pad_crop(): cosmetic alignment fixes drivers/media/i2c/tvp5150.c | 130 ++-- 1 file changed, 96 insertions(+), 34 deletions(-) diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c index 4e3228b2ccbc..9331609425bf 100644 --- a/drivers/media/i2c/tvp5150.c +++ b/drivers/media/i2c/tvp5150.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "tvp5150_reg.h" @@ -997,20 +998,48 @@ static void tvp5150_set_default(v4l2_std_id std, struct v4l2_rect *crop) crop->height = TVP5150_V_MAX_OTHERS; } +static struct v4l2_rect * +__tvp5150_get_pad_crop(struct tvp5150 *decoder, + struct v4l2_subdev_pad_config *cfg, unsigned int pad, + enum v4l2_subdev_format_whence which) +{ + switch (which) { + case V4L2_SUBDEV_FORMAT_TRY: +#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API) + return v4l2_subdev_get_try_crop(&decoder->sd, cfg, pad); +#else + return ERR_PTR(-ENOTTY); +#endif + case V4L2_SUBDEV_FORMAT_ACTIVE: + return &decoder->rect; + default: + return NULL; + } +} + static int tvp5150_fill_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_format *format) { struct v4l2_mbus_framefmt *f; + struct v4l2_rect *__crop; struct tvp5150 *decoder = to_tvp5150(sd); if (!format || (format->pad != TVP5150_PAD_VID_OUT)) return -EINVAL; f = &format->format; + __crop = __tvp5150_get_pad_crop(decoder, cfg, format->pad, + format->which); + if (IS_ERR_OR_NULL(__crop)) { + if (!__crop) + return -EINVAL; + else + return PTR_ERR(__crop); + } - f->width = decoder->rect.width; - f->height = decoder->rect.height / 2; + f->width = __crop->width; + f->height = __crop->height / 2; f->code = TVP5150_MBUS_FMT; f->field = TVP5150_FIELD; @@ -1021,17 +1050,51 @@ static int tvp5150_fill_fmt(struct v4l2_subdev *sd, return 0; } +unsigned int tvp5150_get_hmax(struct v4l2_subdev *sd) +{ + struct tvp5150 *decoder = to_tvp5150(sd); + v4l2_std_id std; + + /* Calculate height based on current standard */ + if (decoder->norm == V4L2_STD_ALL) + std = tvp5150_read_std(sd); + else + std = decoder->norm; + + return (std & V4L2_STD_525_60) ? + TVP5150_V_MAX_525_60 : TVP5150_V_MAX_OTHERS; +} + +static inline void +__tvp5150_set_selection(struct v4l2_subdev *sd, struct v4l2_rect rect) +{ + struct tvp5150 *decoder = to_tvp5150(sd); + unsigned int hmax = tvp5150_get_hmax(sd); + + regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_START, rect.top); + regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_STOP, +rect.top + rect.height - hmax); + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_MSB, +rect.left >> TVP5150_CROP_SHIFT); + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_LSB, +rect.left | (1 << TVP5150_CROP_SHIFT)); + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_STP_MSB, +(rect.left + rect.width - TVP5150_MAX_CROP_LEFT) >> +TVP5150_CROP_SHIFT); + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_STP_LSB, +rect.left + rect.width - TVP5150_MAX_CROP_LEFT); +} + static int tvp5150_set_selection(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_selection *sel) { struct tvp5150 *decoder = to_tvp5150(sd); struct v4l2_rect rect = sel->r; - v4l2_std_id std; - int hmax; + struct v4l2_rect *__crop; + unsigned int hmax; - if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE || - sel->target != V4L2_SEL_TGT_CROP) + if (sel->targ