Skip to content

Commit

Permalink
[media] cobalt: accept unchanged timings when vb2_is_busy()
Browse files Browse the repository at this point in the history
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 <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Jul 22, 2015
1 parent c99235f commit 810c168
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions drivers/media/pci/cobalt/cobalt-v4l2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 810c168

Please sign in to comment.