diff options
| author | Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> | 2018-05-11 10:41:26 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-05-11 11:39:51 -0400 |
| commit | 3997716898a90954e00e4a5d5f1eacb94fbc41d9 (patch) | |
| tree | 32447612d3264d8df981f47495729b817475f44e | |
| parent | d73c3357c8a844d108083f4df2837adab9ebb265 (diff) | |
| download | linux-3997716898a90954e00e4a5d5f1eacb94fbc41d9.tar.bz2 | |
media: rcar-vin: fix crop and compose handling for Gen3
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>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
| -rw-r--r-- | drivers/media/platform/rcar-vin/rcar-v4l2.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c index 2fb8587116f2..e78fba84d590 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; } |