| Message ID | 20180302015751.25596-12-niklas.soderlund+renesas@ragnatech.se (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Niklas, Thank you for the patch. On Friday, 2 March 2018 03:57:30 EET Niklas Söderlund wrote: > If the field is not supported by the driver it should not try to keep > the current field. Instead it should set it to a default fallback. Since > trying a format should always result in the same state regardless of the > current state of the device. > > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/platform/rcar-vin/rcar-v4l2.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c > b/drivers/media/platform/rcar-vin/rcar-v4l2.c index > c2265324c7c96308..ebcd78b1bb6e8cb6 100644 > --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c > +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c > @@ -23,6 +23,7 @@ > #include "rcar-vin.h" > > #define RVIN_DEFAULT_FORMAT V4L2_PIX_FMT_YUYV > +#define RVIN_DEFAULT_FIELD V4L2_FIELD_NONE > > /* > --------------------------------------------------------------------------- > -- * Format Conversions > @@ -143,7 +144,7 @@ static int rvin_reset_format(struct rvin_dev *vin) > case V4L2_FIELD_INTERLACED: > break; > default: > - vin->format.field = V4L2_FIELD_NONE; > + vin->format.field = RVIN_DEFAULT_FIELD; > break; > } > > @@ -213,10 +214,6 @@ static int __rvin_try_format(struct rvin_dev *vin, > u32 walign; > int ret; > > - /* Keep current field if no specific one is asked for */ > - if (pix->field == V4L2_FIELD_ANY) > - pix->field = vin->format.field; > - > /* If requested format is not supported fallback to the default */ > if (!rvin_format_from_pixel(pix->pixelformat)) { > vin_dbg(vin, "Format 0x%x not found, using default 0x%x\n", > @@ -246,7 +243,7 @@ static int __rvin_try_format(struct rvin_dev *vin, > case V4L2_FIELD_INTERLACED: > break; > default: > - pix->field = V4L2_FIELD_NONE; > + pix->field = RVIN_DEFAULT_FIELD; > break; > }
diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c index c2265324c7c96308..ebcd78b1bb6e8cb6 100644 --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c @@ -23,6 +23,7 @@ #include "rcar-vin.h" #define RVIN_DEFAULT_FORMAT V4L2_PIX_FMT_YUYV +#define RVIN_DEFAULT_FIELD V4L2_FIELD_NONE /* ----------------------------------------------------------------------------- * Format Conversions @@ -143,7 +144,7 @@ static int rvin_reset_format(struct rvin_dev *vin) case V4L2_FIELD_INTERLACED: break; default: - vin->format.field = V4L2_FIELD_NONE; + vin->format.field = RVIN_DEFAULT_FIELD; break; } @@ -213,10 +214,6 @@ static int __rvin_try_format(struct rvin_dev *vin, u32 walign; int ret; - /* Keep current field if no specific one is asked for */ - if (pix->field == V4L2_FIELD_ANY) - pix->field = vin->format.field; - /* If requested format is not supported fallback to the default */ if (!rvin_format_from_pixel(pix->pixelformat)) { vin_dbg(vin, "Format 0x%x not found, using default 0x%x\n", @@ -246,7 +243,7 @@ static int __rvin_try_format(struct rvin_dev *vin, case V4L2_FIELD_INTERLACED: break; default: - pix->field = V4L2_FIELD_NONE; + pix->field = RVIN_DEFAULT_FIELD; break; }
If the field is not supported by the driver it should not try to keep the current field. Instead it should set it to a default fallback. Since trying a format should always result in the same state regardless of the current state of the device. Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> --- drivers/media/platform/rcar-vin/rcar-v4l2.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)