| Message ID | 20180511144126.24804-3-niklas.soderlund+renesas@ragnatech.se (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Hello! On 05/11/2018 05:41 PM, Niklas Söderlund wrote: > When refactoring the Gen3 enablement series crop and compose handling > where broken. This went unnoticed but can result in writing out side the s/Where/Were/? > capture buffer. Fix this by restoring the crop and compose to reflect > the format dimensions as we have not yet enabled the scaler for Gen3. > > Fixes: 5e7c623632fcf8f5 ("media: rcar-vin: use different v4l2 operations in media controller mode") > Reported-by: Jacopo Mondi <jacopo+renesas@jmondi.org> > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> [...] MBR, Sergei
Hi Niklas, This looks like quite the improvement :D On 11/05/18 15:41, Niklas Söderlund wrote: > When refactoring the Gen3 enablement series crop and compose handling > where broken. This went unnoticed but can result in writing out side the As well as Sergei's 'where/were', 'out side' is one word in this context. 'outside of the capture buffer' > capture buffer. Fix this by restoring the crop and compose to reflect > the format dimensions as we have not yet enabled the scaler for Gen3. > > Fixes: 5e7c623632fcf8f5 ("media: rcar-vin: use different v4l2 operations in media controller mode") > Reported-by: Jacopo Mondi <jacopo+renesas@jmondi.org> > 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-v4l2.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c > index 2fb8587116f25a4f..e78fba84d59028ef 100644 > --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c > +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c > @@ -702,6 +702,12 @@ static int rvin_mc_s_fmt_vid_cap(struct file *file, void *priv, > > vin->format = f->fmt.pix; > > + vin->crop.top = 0; > + vin->crop.left = 0; > + vin->crop.width = vin->format.width; > + vin->crop.height = vin->format.height; > + vin->compose = vin->crop; > + > return 0; > } > >
diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c index 2fb8587116f25a4f..e78fba84d59028ef 100644 --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c @@ -702,6 +702,12 @@ static int rvin_mc_s_fmt_vid_cap(struct file *file, void *priv, vin->format = f->fmt.pix; + vin->crop.top = 0; + vin->crop.left = 0; + vin->crop.width = vin->format.width; + vin->crop.height = vin->format.height; + vin->compose = vin->crop; + return 0; }
When refactoring the Gen3 enablement series crop and compose handling where broken. This went unnoticed but can result in writing out side the capture buffer. Fix this by restoring the crop and compose to reflect the format dimensions as we have not yet enabled the scaler for Gen3. Fixes: 5e7c623632fcf8f5 ("media: rcar-vin: use different v4l2 operations in media controller mode") Reported-by: Jacopo Mondi <jacopo+renesas@jmondi.org> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> --- drivers/media/platform/rcar-vin/rcar-v4l2.c | 6 ++++++ 1 file changed, 6 insertions(+)