openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: Revert "media: vimc: Remove or modify stream checks" 

This reverts commit 3c1b9ac753.

Required to Revert "media: vimc: propagate pixel format in the stream"
which introduced the stream object in the vimc_ent_device struct.

Signed-off-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Lucas A. M. Magalhaes <lucmaga@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Helen Koike 2019-08-08 21:27:40 -03:00 committed by Mauro Carvalho Chehab
parent 84246ae3fd
commit 10b1aed6da
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/platform/vimc/vimc-debayer.c
View File

@ -262,7 +262,7 @@ static int vimc_deb_set_fmt(struct v4l2_subdev *sd,
if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) { if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
/* Do not change the format while stream is on */ /* Do not change the format while stream is on */
if (vdeb->ved.stream) if (vdeb->src_frame)
return -EBUSY; return -EBUSY;
sink_fmt = &vdeb->sink_fmt; sink_fmt = &vdeb->sink_fmt;
@ -329,6 +329,9 @@ static int vimc_deb_s_stream(struct v4l2_subdev *sd, int enable)
const struct v4l2_format_info *pix_info; const struct v4l2_format_info *pix_info;
unsigned int frame_size; unsigned int frame_size;
if (vdeb->src_frame)
return 0;
/* We only support translating bayer to RGB24 */ /* We only support translating bayer to RGB24 */
if (src_pixelformat != V4L2_PIX_FMT_RGB24) { if (src_pixelformat != V4L2_PIX_FMT_RGB24) {
dev_err(vdeb->dev, dev_err(vdeb->dev,

7
drivers/media/platform/vimc/vimc-scaler.c
View File

@ -148,7 +148,7 @@ static int vimc_sca_set_fmt(struct v4l2_subdev *sd,
if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) { if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
/* Do not change the format while stream is on */ /* Do not change the format while stream is on */
if (vsca->ved.stream) if (vsca->src_frame)
return -EBUSY; return -EBUSY;
sink_fmt = &vsca->sink_fmt; sink_fmt = &vsca->sink_fmt;
@ -203,6 +203,9 @@ static int vimc_sca_s_stream(struct v4l2_subdev *sd, int enable)
const struct v4l2_format_info *pix_info; const struct v4l2_format_info *pix_info;
unsigned int frame_size; unsigned int frame_size;
if (vsca->src_frame)
return 0;
if (!vimc_sca_is_pixfmt_supported(pixelformat)) { if (!vimc_sca_is_pixfmt_supported(pixelformat)) {
dev_err(vsca->dev, "pixfmt (0x%08x) is not supported\n", dev_err(vsca->dev, "pixfmt (0x%08x) is not supported\n",
pixelformat); pixelformat);
@ -324,7 +327,7 @@ static void *vimc_sca_process_frame(struct vimc_ent_device *ved,
ved); ved);
/* If the stream in this node is not active, just return */ /* If the stream in this node is not active, just return */
if (!ved->stream) if (!vsca->src_frame)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
vimc_sca_fill_src_frame(vsca, sink_frame); vimc_sca_fill_src_frame(vsca, sink_frame);

6
drivers/media/platform/vimc/vimc-sensor.c
View File

@ -131,7 +131,7 @@ static int vimc_sen_set_fmt(struct v4l2_subdev *sd,
if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) { if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
/* Do not change the format while stream is on */ /* Do not change the format while stream is on */
if (vsen->ved.stream) if (vsen->frame)
return -EBUSY; return -EBUSY;
mf = &vsen->mbus_format; mf = &vsen->mbus_format;
@ -187,6 +187,10 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable)
const struct v4l2_format_info *pix_info; const struct v4l2_format_info *pix_info;
unsigned int frame_size; unsigned int frame_size;
if (vsen->kthread_sen)
/* tpg is already executing */
return 0;
/* Calculate the frame size */ /* Calculate the frame size */
pix_info = v4l2_format_info(pixelformat); pix_info = v4l2_format_info(pixelformat);
frame_size = vsen->mbus_format.width * pix_info->bpp[0] * frame_size = vsen->mbus_format.width * pix_info->bpp[0] *