Address device enumeration and run_mode
Subsystems (4)
cover Address device enumeration and run_mode
As the atomisp is starting to work with normal V4L2 apps (on USERPTR mode), change the code to:
1. start creating devices from the one that atually works with normal apps (the preview device, previously /dev/video2);
2. Set run_mode for all device types that need it.
Please notice that patch 1 replaces a previously sent patch:
https://lore.kernel.org/all/543e61dd07c90a7d8577b3a94696edc77953b9d8.1635497370.git.mchehab+huawei@kernel.org/
Mauro Carvalho Chehab (2):
media: atomisp: set per-device's default mode
media: atomisp: register first the preview devnode
.../staging/media/atomisp/pci/atomisp_fops.c | 5 +++ .../media/atomisp/pci/atomisp_subdev.c | 31 ++++++++++++------- .../media/atomisp/pci/atomisp_subdev.h | 3 ++ .../staging/media/atomisp/pci/atomisp_v4l2.c | 4 ++- .../staging/media/atomisp/pci/atomisp_v4l2.h | 3 +- 5 files changed, 32 insertions(+), 14 deletions(-)
Signature · 1 line
2.33.1
PATCH 1/2 media: atomisp: set per-device's default mode
The atomisp driver originally used the s_parm command to initialize the run_mode type to the driver. So, before start setting up the streaming, s_parm should be called.
So, even having 5 "normal" video devices, one meant to be used for each type, the run_mode was actually selected when s_parm is called.
Without setting the run mode, applications that don't call VIDIOC_SET_PARM with a custom atomisp parameters won't work, as the pipeline won't be set:
atomisp-isp2 0000:00:03.0: can't create streams atomisp-isp2 0000:00:03.0: __get_frame_info 1600x1200 (padded to 0) returned -22
However, commit 8a7c5594c020 ("media: v4l2-ioctl: clear fields in s_parm") broke support for it, with a good reason, as drivers shoudn't be extending the API for their own purposes.
So, as an step to allow generic apps to use this driver, put the device's run_mode in preview after open.
After this patch, using v4l2grab starts to work on preview mode (/dev/video2):
$ v4l2grab -f YUYV -x 1600 -y 1200 -d /dev/video2 -n 1 -u $ feh out000.pnm
So, let's just setup the default run_mode that each video devnode should assume, setting it at open() time.
---
To mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 0/2] at: https://lore.kernel.org/all/[email protected]/
drivers/staging/media/atomisp/pci/atomisp_fops.c | 5 +++++ .../staging/media/atomisp/pci/atomisp_subdev.c | 15 ++++++++++----- .../staging/media/atomisp/pci/atomisp_subdev.h | 3 +++ drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 4 +++- drivers/staging/media/atomisp/pci/atomisp_v4l2.h | 3 ++- 5 files changed, 23 insertions(+), 7 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_fops.c +5 -0
@@ -899,6 +899,11 @@ static int atomisp_open(struct file *file)else pipe->users++;rt_mutex_unlock (&isp->mutex); + +/* Ensure that a mode is set */ +if (asd) +v4l2_ctrl_s_ctrl (asd->run_mode, pipe->default_run_mode); +return 0 ; css_error:
drivers/staging/media/atomisp/pci/atomisp_subdev.c +10 -5
@@ -1164,23 +1164,28 @@ static int isp_subdev_init_entities(struct atomisp_sub_device *asd)atomisp_init_acc_pipe (asd, &asd->video_acc); - ret =atomisp_video_init (&asd->video_in,"MEMORY" ); + ret =atomisp_video_init (&asd->video_in,"MEMORY" , +ATOMISP_RUN_MODE_SDV );if (ret <0 )return ret; - ret =atomisp_video_init (&asd->video_out_capture,"CAPTURE" ); + ret =atomisp_video_init (&asd->video_out_capture,"CAPTURE" , +ATOMISP_RUN_MODE_STILL_CAPTURE );if (ret <0 )return ret; - ret =atomisp_video_init (&asd->video_out_vf,"VIEWFINDER" ); + ret =atomisp_video_init (&asd->video_out_vf,"VIEWFINDER" , +ATOMISP_RUN_MODE_CONTINUOUS_CAPTURE );if (ret <0 )return ret; - ret =atomisp_video_init (&asd->video_out_preview,"PREVIEW" ); + ret =atomisp_video_init (&asd->video_out_preview,"PREVIEW" , +ATOMISP_RUN_MODE_PREVIEW );if (ret <0 )return ret; - ret =atomisp_video_init (&asd->video_out_video_capture,"VIDEO" ); + ret =atomisp_video_init (&asd->video_out_video_capture,"VIDEO" , +ATOMISP_RUN_MODE_VIDEO );if (ret <0 )return ret;
drivers/staging/media/atomisp/pci/atomisp_subdev.h +3 -0
@@ -81,6 +81,9 @@ struct atomisp_video_pipe {/* the link list to store per_frame parameters */ struct list_head per_frame_params; +/* Store here the initial run mode */ +unsigned int default_run_mode; +unsigned int buffers_in_css;/* irq_lock is used to protect video buffer state change operations and
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +3 -1
@@ -447,7 +447,8 @@ const struct atomisp_dfs_config dfs_config_cht_soc = { .dfs_table_size = ARRAY_SIZE(dfs_rules_cht_soc), }; -int atomisp_video_init (struct atomisp_video_pipe *video,const char *name) +int atomisp_video_init (struct atomisp_video_pipe *video,const char *name, +unsigned int run_mode) {int ret;const char *direction;
@@ -478,6 +479,7 @@ int atomisp_video_init(struct atomisp_video_pipe *video, const char *name) "ATOMISP ISP %s %s", name, direction); video->vdev.release = video_device_release_empty;video_set_drvdata (&video->vdev, video->isp); + video->default_run_mode = run_mode;return 0 ; }
drivers/staging/media/atomisp/pci/atomisp_v4l2.h +2 -1
@@ -27,7 +27,8 @@ struct v4l2_device;struct atomisp_device ;struct firmware ; -int atomisp_video_init (struct atomisp_video_pipe *video,const char *name); +int atomisp_video_init (struct atomisp_video_pipe *video,const char *name, +unsigned int run_mode);void atomisp_acc_init (struct atomisp_acc_pipe *video,const char *name);void atomisp_video_unregister (struct atomisp_video_pipe *video);void atomisp_acc_unregister (struct atomisp_acc_pipe *video);
Signature · 1 line
2.33.1
PATCH 2/2 media: atomisp: register first the preview devnode
In reply to Mauro Carvalho ChehabThe atomisp currenyl registers 5 pairs of devices each one for one different run_mode, plus one for "ACC". The only one that behaves like a normal V4L2 device is the preview one. The others are doing weird things, and perhaps are using some proprietary extensions to the API.
Change the device order to start with the preview one, e. g:
/dev/video0: ATOMISP ISP PREVIEW output /dev/video1: ATOMISP ISP CAPTURE output /dev/video2: ATOMISP ISP VIEWFINDER output /dev/video3: ATOMISP ISP VIDEO output /dev/video4: ATOMISP ACC
This way, a normal V4L2 application will get the right device, as the first one will be the one they should use.
---
To mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 0/2] at: https://lore.kernel.org/all/[email protected]/
.../staging/media/atomisp/pci/atomisp_subdev.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_subdev.c +9 -7
@@ -1356,6 +1356,14 @@ int atomisp_subdev_register_entities(struct atomisp_sub_device *asd,if (ret <0 ) goto error; + asd->video_out_preview.vdev.v4l2_dev = vdev; + asd->video_out_preview.vdev.device_caps = device_caps | +V4L2_CAP_VIDEO_OUTPUT ; + ret =video_register_device (&asd->video_out_preview.vdev, +VFL_TYPE_VIDEO ,-1 ); +if (ret <0 ) + goto error; + asd->video_out_capture.vdev.v4l2_dev = vdev; asd->video_out_capture.vdev.device_caps = device_caps |V4L2_CAP_VIDEO_OUTPUT ;
@@ -1371,13 +1379,7 @@ int atomisp_subdev_register_entities(struct atomisp_sub_device *asd, VFL_TYPE_VIDEO, -1);if (ret <0 ) goto error; - asd->video_out_preview.vdev.v4l2_dev = vdev; - asd->video_out_preview.vdev.device_caps = device_caps | -V4L2_CAP_VIDEO_OUTPUT ; - ret =video_register_device (&asd->video_out_preview.vdev, -VFL_TYPE_VIDEO ,-1 ); -if (ret <0 ) - goto error; + asd->video_out_video_capture.vdev.v4l2_dev = vdev; asd->video_out_video_capture.vdev.device_caps = device_caps |V4L2_CAP_VIDEO_OUTPUT ;
Signature · 1 line
2.33.1