Skip to contentSkip to conversation

cobalt: accept unchanged timings when vb2_is_busy().

PATCH New Hans Verkuil 1 participant 1 message Jul 17, 2015

Subsystems (2)
Media (V4L/DVB) Cobalt media driver
lore
Share & tools
lore

Hans Verkuil

author
#0 lore raw

PATCH 1/1 cobalt: accept unchanged timings when vb2_is_busy().

When vb2_is_busy() it should still be possible to call S_DV_TIMINGS provided the new timings are the same as the current timings.

For input 1 (test generator) the size is always 1080p, so just return that.

Fixes a v4l2-compliance issue.

Signed-off-by Hans Verkuil <[email protected]>
---
 drivers/media/pci/cobalt/cobalt-v4l2.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/media/pci/cobalt/cobalt-v4l2.c +8 -3
index b40c2d1..9756fd3 100644
@@ -28,6 +28,7 @@
 
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-event.h>
+#include <media/v4l2-dv-timings.h>
 #include <media/adv7604.h>
 #include <media/adv7842.h>
 

@@ -641,13 +642,17 @@ static int cobalt_s_dv_timings(struct file *file, void *priv_fh,
 	struct cobalt_stream *s = video_drvdata(file);
 	int err;
 
-	if (vb2_is_busy(&s->q))
-		return -EBUSY;
-
 	if (s->input == 1) {
 		*timings = cea1080p60;
 		return 0;
 	}
+
+	if (v4l2_match_dv_timings(timings, &s->timings, 0))
+		return 0;
+
+	if (vb2_is_busy(&s->q))
+		return -EBUSY;
+
 	err = v4l2_subdev_call(s->sd,
 			video, s_dv_timings, timings);
 	if (!err) {
Signature · 1 line
2.1.4