mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-17 11:54:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

media: atomisp: Remove continuous mode related code from atomisp_set_fmt()

Browse Source 
Remove code to check / adjust code between video and preview /
capture and view-finder nodes now that we no longer support
continuous mode and this no longer support streaming from 2
/dev/video# nodes at the same time.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Hans de Goede
2023-03-05 16:39:51 +00:00
committed by Mauro Carvalho Chehab
parent 5fa5657be2
commit b3713bca92
1 changed files with 1 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
drivers/staging/media/atomisp/pci/atomisp_cmd.c
View File

@@ -4630,88 +4630,6 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f)
snr_fmt = f->fmt.pix;
backup_fmt = snr_fmt;
/**********************************************************************/
if (source_pad == ATOMISP_SUBDEV_PAD_SOURCE_VF ||
(source_pad == ATOMISP_SUBDEV_PAD_SOURCE_PREVIEW
&& asd->run_mode->val == ATOMISP_RUN_MODE_VIDEO)) {
if (asd->fmt_auto->val) {
struct v4l2_rect *capture_comp;
struct v4l2_rect r = {0};
r.width = f->fmt.pix.width;
r.height = f->fmt.pix.height;
if (source_pad == ATOMISP_SUBDEV_PAD_SOURCE_PREVIEW)
capture_comp = atomisp_subdev_get_rect(
&asd->subdev, NULL,
V4L2_SUBDEV_FORMAT_ACTIVE,
ATOMISP_SUBDEV_PAD_SOURCE_VIDEO,
V4L2_SEL_TGT_COMPOSE);
else
capture_comp = atomisp_subdev_get_rect(
&asd->subdev, NULL,
V4L2_SUBDEV_FORMAT_ACTIVE,
ATOMISP_SUBDEV_PAD_SOURCE_CAPTURE,
V4L2_SEL_TGT_COMPOSE);
if (capture_comp->width < r.width
|| capture_comp->height < r.height) {
r.width = capture_comp->width;
r.height = capture_comp->height;
}
atomisp_subdev_set_selection(
&asd->subdev, fh.state,
V4L2_SUBDEV_FORMAT_ACTIVE, source_pad,
V4L2_SEL_TGT_COMPOSE, 0, &r);
f->fmt.pix.width = r.width;
f->fmt.pix.height = r.height;
}
if (source_pad == ATOMISP_SUBDEV_PAD_SOURCE_PREVIEW) {
atomisp_css_video_configure_viewfinder(asd,
f->fmt.pix.width, f->fmt.pix.height,
format_bridge->planar ? f->fmt.pix.bytesperline
: f->fmt.pix.bytesperline * 8
/ format_bridge->depth, format_bridge->sh_fmt);
atomisp_css_video_get_viewfinder_frame_info(asd,
&output_info);
asd->copy_mode = false;
} else {
atomisp_css_capture_configure_viewfinder(asd,
f->fmt.pix.width, f->fmt.pix.height,
format_bridge->planar ? f->fmt.pix.bytesperline
: f->fmt.pix.bytesperline * 8
/ format_bridge->depth, format_bridge->sh_fmt);
atomisp_css_capture_get_viewfinder_frame_info(asd,
&output_info);
asd->copy_mode = false;
}
goto done;
}
/*
* Check whether main resolution configured smaller
* than snapshot resolution. If so, force main resolution
* to be the same as snapshot resolution
*/
if (source_pad == ATOMISP_SUBDEV_PAD_SOURCE_CAPTURE) {
struct v4l2_rect *r;
r = atomisp_subdev_get_rect(
&asd->subdev, NULL,
V4L2_SUBDEV_FORMAT_ACTIVE,
ATOMISP_SUBDEV_PAD_SOURCE_VF, V4L2_SEL_TGT_COMPOSE);
if (r->width && r->height
&& (r->width > f->fmt.pix.width
|| r->height > f->fmt.pix.height))
dev_warn(isp->dev,
"Main Resolution config smaller then Vf Resolution. Force to be equal with Vf Resolution.");
}
/* Pipeline configuration done through subdevs. Bail out now. */
if (!asd->fmt_auto->val)
goto set_fmt_to_isp;
@@ -4882,7 +4800,7 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f)
dev_warn(isp->dev, "Can't set format on ISP. Error %d\n", ret);
return -EINVAL;
}
done:
pipe->pix.width = f->fmt.pix.width;
pipe->pix.height = f->fmt.pix.height;
pipe->pix.pixelformat = f->fmt.pix.pixelformat;