aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2009-08-25 11:46:53 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-19 00:18:59 -0300
commitb897a91afbed57558324ef4059efa2e2419e8b66 (patch)
tree13528b6b4367f05bfa96836bb8c934b184390f62
parent68a54f0e53b62806040fb7884b2e0d79b922bf00 (diff)
V4L/DVB (12525): soc-camera: prohibit geometry change with initialised buffers
Prohibit S_FMT and S_CROP with a different window width or height after video buffer initialisation. This simplifies the work to be done in specific host and client drivers, and it doesn't seem to make much sense to allow these changes. We do however allow S_CROP with equal width and height to just move the window, this doesn't affect video buffer management and is usually easy enough to implement. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/soc_camera.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index a22fcd0ff8b..21a8aa586da 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -517,8 +517,8 @@ static int soc_camera_s_fmt_vid_cap(struct file *file, void *priv,
mutex_lock(&icf->vb_vidq.vb_lock);
- if (videobuf_queue_is_busy(&icf->vb_vidq)) {
- dev_err(&icd->dev, "S_FMT denied: queue busy\n");
+ if (icf->vb_vidq.bufs[0]) {
+ dev_err(&icd->dev, "S_FMT denied: queue initialised\n");
ret = -EBUSY;
goto unlock;
}
@@ -768,6 +768,15 @@ static int soc_camera_s_crop(struct file *file, void *fh,
/* Cropping is allowed during a running capture, guard consistency */
mutex_lock(&icf->vb_vidq.vb_lock);
+ /* Prohibit window size change with initialised buffers */
+ if (icf->vb_vidq.bufs[0] && (rect.width != icd->rect_current.width ||
+ rect.height != icd->rect_current.height)) {
+ dev_err(&icd->dev,
+ "S_CROP denied: queue initialised and sizes differ\n");
+ ret = -EBUSY;
+ goto unlock;
+ }
+
if (rect.width > icd->rect_max.width)
rect.width = icd->rect_max.width;
@@ -792,6 +801,7 @@ static int soc_camera_s_crop(struct file *file, void *fh,
if (!ret)
icd->rect_current = rect;
+unlock:
mutex_unlock(&icf->vb_vidq.vb_lock);
return ret;