diff options
| author |   André Almeida <andrealmeid@collabora.com> | 2019-05-30 09:19:56 -0400 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-06-05 12:47:08 -0400 |
| commit | 3c1b9ac753e99005d7ee0a883d6e5b577ba32aa9 (patch) | |
| tree | ab4def1e4d61ac9de2b8c0b8571f69298de9a799 /drivers/media/platform/vimc/vimc-debayer.c | |
| parent | media: media/doc: Allow sizeimage to be set by v4l clients (diff) | |
| download | wireguard-linux-3c1b9ac753e99005d7ee0a883d6e5b577ba32aa9.tar.xz wireguard-linux-3c1b9ac753e99005d7ee0a883d6e5b577ba32aa9.zip | |
media: vimc: Remove or modify stream checks
Change the way subdevices check if the stream is running. Verify the stream
pointer instead of src_frame. This makes easier to get rid of the void* and
u8* that points to frames in the subdevices structs.
Remove checks that s_stream does on subdevices. They are redundant since
the Media Controller Framework doesn't allow two streaming on the same
media pipeline at the same time.
Signed-off-by: André Almeida <andrealmeid@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/platform/vimc/vimc-debayer.c')
| -rw-r--r-- | drivers/media/platform/vimc/vimc-debayer.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/platform/vimc/vimc-debayer.c b/drivers/media/platform/vimc/vimc-debayer.c index 281f9c1a7249..b221f26e01cf 100644 --- a/drivers/media/platform/vimc/vimc-debayer.c +++ b/drivers/media/platform/vimc/vimc-debayer.c @@ -270,7 +270,7 @@ static int vimc_deb_set_fmt(struct v4l2_subdev *sd, if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) { /* Do not change the format while stream is on */ - if (vdeb->src_frame) + if (vdeb->ved.stream) return -EBUSY; sink_fmt = &vdeb->sink_fmt; @@ -337,9 +337,6 @@ static int vimc_deb_s_stream(struct v4l2_subdev *sd, int enable) const struct v4l2_format_info *pix_info; unsigned int frame_size; - if (vdeb->src_frame) - return 0; - /* We only support translating bayer to RGB24 */ if (src_pixelformat != V4L2_PIX_FMT_RGB24) { dev_err(vdeb->dev, |