media: replace g/s_parm by g/s_frame_interval
Subsystems (11)
v2 cover media: replace g/s_parm by g/s_frame_interval
From: Hans Verkuil <[email protected]>
There are currently two subdev ops variants to get/set the frame interval:
g/s_parm and g/s_frame_interval.
This patch series replaces all g/s_parm calls by g/s_frame_interval.
The first patch adds helper functions that can be used by bridge drivers. Only em28xx can't use it and it needs custom code (it uses v4l2_device_call() to try all subdevs instead of calling a specific subdev).
The next patch converts all non-staging drivers, then come Sakari's atomisp staging fixes.
The v4l2-subdev.h patch removes the now obsolete g/s_parm ops and the final patch clarifies the documentation a bit (the core allows for _MPLANE to be used as well).
I would really like to take the next step and introduce two new ioctls VIDIOC_G/S_FRAME_INTERVAL (just like the SUBDEV variants that already exist) and convert all bridge drivers to use that and just have helper functions in the core for VIDIOC_G/S_PARM.
I hate that ioctl and it always confuses driver developers. It would also prevent the type of abuse that was present in the atomisp driver.
But that's for later, let's simplify the subdev drivers first.
Regards,
Hans
Changes since v1:
- incorporated all comments from Sakari
Hans Verkuil (4):
v4l2-common: create v4l2_g/s_parm_cap helpers
media: convert g/s_parm to g/s_frame_interval in subdevs v4l2-subdev.h: remove obsolete g/s_parm vidioc-g-parm.rst: also allow _MPLANE buffer types
Sakari Ailus (5):
staging: atomisp: Kill subdev s_parm abuse
staging: atomisp: i2c: Disable non-preview configurations
staging: atomisp: i2c: Drop g_parm support in sensor drivers
staging: atomisp: mt9m114: Drop empty s_parm callback
staging: atomisp: Drop g_parm and s_parm subdev ops use
Documentation/media/uapi/v4l/vidioc-g-parm.rst | 7 ++- drivers/media/i2c/mt9v011.c | 31 ++++------ drivers/media/i2c/ov6650.c | 35 +++++------ drivers/media/i2c/ov7670.c | 24 ++++---- drivers/media/i2c/ov7740.c | 31 ++++------ drivers/media/i2c/tvp514x.c | 39 +++++-------- drivers/media/i2c/vs6624.c | 29 ++++----- drivers/media/platform/atmel/atmel-isc.c | 10 +--- drivers/media/platform/atmel/atmel-isi.c | 12 +--- drivers/media/platform/blackfin/bfin_capture.c | 14 ++--- drivers/media/platform/marvell-ccic/mcam-core.c | 12 ++-- drivers/media/platform/soc_camera/soc_camera.c | 10 ++-- drivers/media/platform/via-camera.c | 4 +- drivers/media/usb/em28xx/em28xx-video.c | 36 ++++++++++-- drivers/media/v4l2-core/v4l2-common.c | 48 +++++++++++++++ drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 53 ----------------- drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 53 ----------------- .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 6 -- drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 56 ------------------ drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 53 ----------------- drivers/staging/media/atomisp/i2c/gc0310.h | 43 -------------- drivers/staging/media/atomisp/i2c/gc2235.h | 3 +- drivers/staging/media/atomisp/i2c/ov2680.h | 68 ---------------------- drivers/staging/media/atomisp/i2c/ov2722.h | 2 + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 54 ----------------- drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 2 + .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 9 +-- .../media/atomisp/pci/atomisp2/atomisp_file.c | 16 ----- .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 12 +--- .../media/atomisp/pci/atomisp2/atomisp_tpg.c | 14 ----- include/media/v4l2-common.h | 26 +++++++++ include/media/v4l2-subdev.h | 6 -- 32 files changed, 209 insertions(+), 609 deletions(-)
Signature · 1 line
2.15.1
PATCH v2 1/9 v4l2-common: create v4l2_g/s_parm_cap helpers
From: Hans Verkuil <[email protected]>
Create helpers to handle VIDIOC_G/S_PARM by querying the g/s_frame_interval v4l2_subdev ops.
--- drivers/media/v4l2-core/v4l2-common.c | 48 +++++++++++++++++++++++++++++++++++ include/media/v4l2-common.h | 26 +++++++++++++++++++ 2 files changed, 74 insertions(+)
drivers/media/v4l2-core/v4l2-common.c +48 -0
@@ -392,3 +392,51 @@ void v4l2_get_timestamp(struct timeval *tv) tv->tv_usec = ts.tv_nsec /NSEC_PER_USEC ; }EXPORT_SYMBOL_GPL (v4l2_get_timestamp); + +int v4l2_g_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a) +{ +struct v4l2_subdev_frame_interval ival = {0 }; +int ret; + +if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE && + a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) +return -EINVAL ; + +if (vdev->device_caps &V4L2_CAP_READWRITE ) + a->parm.capture.readbuffers =2 ; +if (v4l2_subdev_has_op (sd, video, g_frame_interval)) + a->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; + ret =v4l2_subdev_call (sd, video, g_frame_interval, &ival); +if (!ret) + a->parm.capture.timeperframe = ival.interval; +return ret; +} +EXPORT_SYMBOL_GPL (v4l2_g_parm_cap); + +int v4l2_s_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a) +{ +struct v4l2_subdev_frame_interval ival = { + .interval = a->parm.capture.timeperframe + }; +int ret; + +if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE && + a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) +return -EINVAL ; + +memset (&a->parm,0 ,sizeof (a->parm)); +if (vdev->device_caps &V4L2_CAP_READWRITE ) + a->parm.capture.readbuffers =2 ; +else + a->parm.capture.readbuffers =0 ; + +if (v4l2_subdev_has_op (sd, video, g_frame_interval)) + a->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; + ret =v4l2_subdev_call (sd, video, s_frame_interval, &ival); +if (!ret) + a->parm.capture.timeperframe = ival.interval; +return ret; +} +EXPORT_SYMBOL_GPL (v4l2_s_parm_cap);
include/media/v4l2-common.h +26 -0
@@ -341,4 +341,30 @@ v4l2_find_nearest_format(const struct v4l2_frmsize_discrete *sizes,*/ void v4l2_get_timestamp (struct timeval *tv); +/** +* v4l2_g_parm_cap - helper routine for vidioc_g_parm to fill this in by +* calling the g_frame_interval op of the given subdev. It only works +* for V4L2_BUF_TYPE_VIDEO_CAPTURE(_MPLANE), hence the _cap in the +* function name. +* +* @vdev: the struct video_device pointer. Used to determine the device caps. +* @sd: the sub-device pointer. +* @a: the VIDIOC_G_PARM argument. +*/ +int v4l2_g_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a); + +/** +* v4l2_s_parm_cap - helper routine for vidioc_s_parm to fill this in by +* calling the s_frame_interval op of the given subdev. It only works +* for V4L2_BUF_TYPE_VIDEO_CAPTURE(_MPLANE), hence the _cap in the +* function name. +* +* @vdev: the struct video_device pointer. Used to determine the device caps. +* @sd: the sub-device pointer. +* @a: the VIDIOC_S_PARM argument. +*/ +int v4l2_s_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a); +#endif /* V4L2_COMMON_H_ */
Signature · 1 line
2.15.1
Re: [PATCHv2 1/9] v4l2-common: create v4l2_g/s_parm_cap helpers
Em Mon, 22 Jan 2018 13:31:17 +0100
Hans Verkuil <[email protected]> escreveu:
Quoted 22 lines
From: Hans Verkuil <[email protected]>
Create helpers to handle VIDIOC_G/S_PARM by querying the g/s_frame_interval
v4l2_subdevops.Signed-off-by Hans Verkuil <[email protected]>--- drivers/media/v4l2-core/v4l2-common.c | 48 +++++++++++++++++++++++++++++++++++ include/media/v4l2-common.h | 26 +++++++++++++++++++ 2 files changed, 74 insertions(+)drivers/media/v4l2-core/v4l2-common.c +3
-0@@ -392,3 +392,51 @@ void v4l2_get_timestamp(struct timeval *tv) tv->tv_usec = ts.tv_nsec /NSEC_PER_USEC ; }EXPORT_SYMBOL_GPL (v4l2_get_timestamp); + +int v4l2_g_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a)
drivers/media/v4l2-core/v4l2-common.c void v4l2_get_timestamp(struct timeval *tv) · line 407
Quoted 10 lines
drivers/media/v4l2-core/v4l2-common.c +10
-0+{ +struct v4l2_subdev_frame_interval ival = {0 }; +int ret; + +if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE && + a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) +return -EINVAL ; + +if (vdev->device_caps &V4L2_CAP_READWRITE ) + a->parm.capture.readbuffers =2 ;
Hmm... why don't you also initialize readbuffers otherwise?
Quoted 60 lines
drivers/media/v4l2-core/v4l2-common.c +35
-0+if (v4l2_subdev_has_op (sd, video, g_frame_interval)) + a->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; + ret =v4l2_subdev_call (sd, video, g_frame_interval, &ival); +if (!ret) + a->parm.capture.timeperframe = ival.interval; +return ret; +} +EXPORT_SYMBOL_GPL (v4l2_g_parm_cap); + +int v4l2_s_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a) +{ +struct v4l2_subdev_frame_interval ival = { + .interval = a->parm.capture.timeperframe + }; +int ret; + +if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE && + a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) +return -EINVAL ; + +memset (&a->parm,0 ,sizeof (a->parm)); +if (vdev->device_caps &V4L2_CAP_READWRITE ) + a->parm.capture.readbuffers =2 ; +else + a->parm.capture.readbuffers =0 ; + +if (v4l2_subdev_has_op (sd, video, g_frame_interval)) + a->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; + ret =v4l2_subdev_call (sd, video, s_frame_interval, &ival); +if (!ret) + a->parm.capture.timeperframe = ival.interval; +return ret; +} +EXPORT_SYMBOL_GPL (v4l2_s_parm_cap);include/media/v4l2-common.h +17
-0@@ -341,4 +341,30 @@ v4l2_find_nearest_format(const struct v4l2_frmsize_discrete *sizes,*/ void v4l2_get_timestamp (struct timeval *tv); +/** +* v4l2_g_parm_cap - helper routine for vidioc_g_parm to fill this in by +* calling the g_frame_interval op of the given subdev. It only works +* for V4L2_BUF_TYPE_VIDEO_CAPTURE(_MPLANE), hence the _cap in the +* function name. +* +* @vdev: the struct video_device pointer. Used to determine the device caps. +* @sd: the sub-device pointer. +* @a: the VIDIOC_G_PARM argument. +*/ +int v4l2_g_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a); + +/** +* v4l2_s_parm_cap - helper routine for vidioc_s_parm to fill this in by +* calling the s_frame_interval op of the given subdev. It only works +* for V4L2_BUF_TYPE_VIDEO_CAPTURE(_MPLANE), hence the _cap in the
include/media/v4l2-common.h v4l2_find_nearest_format(const struct v4l2_frmsize_discrete *sizes, · line 370
Quoted 10 lines
include/media/v4l2-common.h +9
-0+* function name. +* +* @vdev: the struct video_device pointer. Used to determine the device caps. +* @sd: the sub-device pointer. +* @a: the VIDIOC_S_PARM argument. +*/ +int v4l2_s_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a); +#endif /* V4L2_COMMON_H_ */
Thanks,
Mauro
Re: [PATCHv2 1/9] v4l2-common: create v4l2_g/s_parm_cap helpers
Quoted 29 lines · Mauro Carvalho Chehab
Em Mon, 22 Jan 2018 13:31:17 +0100
Hans Verkuil <[email protected]> escreveu:Quoted 26 lines
From: Hans Verkuil <[email protected]>
Create helpers to handle VIDIOC_G/S_PARM by querying the g/s_frame_interval
v4l2_subdevops.Signed-off-by Hans Verkuil <[email protected]>--- drivers/media/v4l2-core/v4l2-common.c | 48 +++++++++++++++++++++++++++++++++++ include/media/v4l2-common.h | 26 +++++++++++++++++++ 2 files changed, 74 insertions(+)drivers/media/v4l2-core/v4l2-common.c +7
-0@@ -392,3 +392,51 @@ void v4l2_get_timestamp(struct timeval *tv) tv->tv_usec = ts.tv_nsec /NSEC_PER_USEC ; }EXPORT_SYMBOL_GPL (v4l2_get_timestamp); + +int v4l2_g_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a) +{ +struct v4l2_subdev_frame_interval ival = {0 }; +int ret; +
Quoted 8 lines
drivers/media/v4l2-core/v4l2-common.c void v4l2_get_timestamp(struct timeval *tv) · line 407
Quoted 6 lines
drivers/media/v4l2-core/v4l2-common.c +6
-0+if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE && + a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) +return -EINVAL ; + +if (vdev->device_caps &V4L2_CAP_READWRITE ) + a->parm.capture.readbuffers =2 ;Hmm... why don't you also initialize readbuffers otherwise?
It's specifically for read(). If read() is not supported, then this is meaningless and should just stay 0. v4l2-compliance checks for this.
The 'readbuffers' field is completely outdated and once this is in the next step is to see if we can come up with something better. I hate G/S_PARM.
Regards,
Hans
Quoted 77 lines
Quoted 61 lines
drivers/media/v4l2-core/v4l2-common.c +35
-0+if (v4l2_subdev_has_op (sd, video, g_frame_interval)) + a->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; + ret =v4l2_subdev_call (sd, video, g_frame_interval, &ival); +if (!ret) + a->parm.capture.timeperframe = ival.interval; +return ret; +} +EXPORT_SYMBOL_GPL (v4l2_g_parm_cap); + +int v4l2_s_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a) +{ +struct v4l2_subdev_frame_interval ival = { + .interval = a->parm.capture.timeperframe + }; +int ret; + +if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE && + a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) +return -EINVAL ; + +memset (&a->parm,0 ,sizeof (a->parm)); +if (vdev->device_caps &V4L2_CAP_READWRITE ) + a->parm.capture.readbuffers =2 ; +else + a->parm.capture.readbuffers =0 ; + +if (v4l2_subdev_has_op (sd, video, g_frame_interval)) + a->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; + ret =v4l2_subdev_call (sd, video, s_frame_interval, &ival); +if (!ret) + a->parm.capture.timeperframe = ival.interval; +return ret; +} +EXPORT_SYMBOL_GPL (v4l2_s_parm_cap);include/media/v4l2-common.h +17
-0@@ -341,4 +341,30 @@ v4l2_find_nearest_format(const struct v4l2_frmsize_discrete *sizes,*/ void v4l2_get_timestamp (struct timeval *tv); +/** +* v4l2_g_parm_cap - helper routine for vidioc_g_parm to fill this in by +* calling the g_frame_interval op of the given subdev. It only works +* for V4L2_BUF_TYPE_VIDEO_CAPTURE(_MPLANE), hence the _cap in the +* function name. +* +* @vdev: the struct video_device pointer. Used to determine the device caps. +* @sd: the sub-device pointer. +* @a: the VIDIOC_G_PARM argument. +*/ +int v4l2_g_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a); + +/** +* v4l2_s_parm_cap - helper routine for vidioc_s_parm to fill this in by +* calling the s_frame_interval op of the given subdev. It only works +* for V4L2_BUF_TYPE_VIDEO_CAPTURE(_MPLANE), hence the _cap in the include/media/v4l2-common.h v4l2_find_nearest_format(const struct v4l2_frmsize_discrete *sizes, · line 370
Quoted 10 lines
include/media/v4l2-common.h +9
-0+* function name. +* +* @vdev: the struct video_device pointer. Used to determine the device caps. +* @sd: the sub-device pointer. +* @a: the VIDIOC_S_PARM argument. +*/ +int v4l2_s_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a); +#endif /* V4L2_COMMON_H_ */ Thanks,
Mauro
Re: [PATCHv2 1/9] v4l2-common: create v4l2_g/s_parm_cap helpers
Em Wed, 14 Feb 2018 17:23:51 +0100
Hans Verkuil <[email protected]> escreveu:
Quoted 39 lines · Mauro Carvalho Chehab
Quoted 29 lines
Em Mon, 22 Jan 2018 13:31:17 +0100
Hans Verkuil <[email protected]> escreveu:Quoted 26 lines
From: Hans Verkuil <[email protected]>
Create helpers to handle VIDIOC_G/S_PARM by querying the g/s_frame_interval
v4l2_subdevops.Signed-off-by Hans Verkuil <[email protected]>--- drivers/media/v4l2-core/v4l2-common.c | 48 +++++++++++++++++++++++++++++++++++ include/media/v4l2-common.h | 26 +++++++++++++++++++ 2 files changed, 74 insertions(+)drivers/media/v4l2-core/v4l2-common.c +7
-0@@ -392,3 +392,51 @@ void v4l2_get_timestamp(struct timeval *tv) tv->tv_usec = ts.tv_nsec /NSEC_PER_USEC ; }EXPORT_SYMBOL_GPL (v4l2_get_timestamp); + +int v4l2_g_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a) +{ +struct v4l2_subdev_frame_interval ival = {0 }; +int ret; +Quoted 8 lines
drivers/media/v4l2-core/v4l2-common.c void v4l2_get_timestamp(struct timeval *tv) · line 407
Quoted 6 lines
drivers/media/v4l2-core/v4l2-common.c +6
-0+if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE && + a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) +return -EINVAL ; + +if (vdev->device_caps &V4L2_CAP_READWRITE ) + a->parm.capture.readbuffers =2 ;Hmm... why don't you also initialize readbuffers otherwise?
Quoted 2 lines
It's specifically for
read(). Ifread()is not supported, then this is meaningless and should just stay 0. v4l2-compliance checks for this.
Well, API states that:
"When an application requests zero buffers, drivers should just return the current setting rather than the minimum or an error code."
So, something should zero it, if not used and type is capture or capture_mplane.
Quoted 3 lines
The 'readbuffers' field is completely outdated and once this is in the next step is to see if we can come up with something better. I hate G/S_PARM.
Yes, it is a weird ioctl, but I'm not yet convinced that we should increase API complexity by adding newer ioctls due to that.
Instead, I would just get rid of .g_parm/.s_parm callbacks, implementing a better kAPI, without bothering adding more complexity to uAPI.
Quoted 83 lines
Regards,
Hans
Quoted 77 lines
Quoted 61 lines
drivers/media/v4l2-core/v4l2-common.c +35
-0+if (v4l2_subdev_has_op (sd, video, g_frame_interval)) + a->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; + ret =v4l2_subdev_call (sd, video, g_frame_interval, &ival); +if (!ret) + a->parm.capture.timeperframe = ival.interval; +return ret; +} +EXPORT_SYMBOL_GPL (v4l2_g_parm_cap); + +int v4l2_s_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a) +{ +struct v4l2_subdev_frame_interval ival = { + .interval = a->parm.capture.timeperframe + }; +int ret; + +if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE && + a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) +return -EINVAL ; + +memset (&a->parm,0 ,sizeof (a->parm)); +if (vdev->device_caps &V4L2_CAP_READWRITE ) + a->parm.capture.readbuffers =2 ; +else + a->parm.capture.readbuffers =0 ; + +if (v4l2_subdev_has_op (sd, video, g_frame_interval)) + a->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; + ret =v4l2_subdev_call (sd, video, s_frame_interval, &ival); +if (!ret) + a->parm.capture.timeperframe = ival.interval; +return ret; +} +EXPORT_SYMBOL_GPL (v4l2_s_parm_cap);include/media/v4l2-common.h +17
-0@@ -341,4 +341,30 @@ v4l2_find_nearest_format(const struct v4l2_frmsize_discrete *sizes,*/ void v4l2_get_timestamp (struct timeval *tv); +/** +* v4l2_g_parm_cap - helper routine for vidioc_g_parm to fill this in by +* calling the g_frame_interval op of the given subdev. It only works +* for V4L2_BUF_TYPE_VIDEO_CAPTURE(_MPLANE), hence the _cap in the +* function name. +* +* @vdev: the struct video_device pointer. Used to determine the device caps. +* @sd: the sub-device pointer. +* @a: the VIDIOC_G_PARM argument. +*/ +int v4l2_g_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a); + +/** +* v4l2_s_parm_cap - helper routine for vidioc_s_parm to fill this in by +* calling the s_frame_interval op of the given subdev. It only works +* for V4L2_BUF_TYPE_VIDEO_CAPTURE(_MPLANE), hence the _cap in the include/media/v4l2-common.h v4l2_find_nearest_format(const struct v4l2_frmsize_discrete *sizes, · line 370
Quoted 10 lines
include/media/v4l2-common.h +9
-0+* function name. +* +* @vdev: the struct video_device pointer. Used to determine the device caps. +* @sd: the sub-device pointer. +* @a: the VIDIOC_S_PARM argument. +*/ +int v4l2_s_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a); +#endif /* V4L2_COMMON_H_ */ Thanks,
Mauro
Thanks,
Mauro
Re: [PATCHv2 1/9] v4l2-common: create v4l2_g/s_parm_cap helpers
Quoted 45 lines · Mauro Carvalho Chehab
Em Wed, 14 Feb 2018 17:23:51 +0100
Hans Verkuil <[email protected]> escreveu:Quoted 39 lines · Mauro Carvalho Chehab
Quoted 29 lines
Em Mon, 22 Jan 2018 13:31:17 +0100
Hans Verkuil <[email protected]> escreveu:Quoted 26 lines
From: Hans Verkuil <[email protected]>
Create helpers to handle VIDIOC_G/S_PARM by querying the g/s_frame_interval
v4l2_subdevops.Signed-off-by Hans Verkuil <[email protected]>--- drivers/media/v4l2-core/v4l2-common.c | 48 +++++++++++++++++++++++++++++++++++ include/media/v4l2-common.h | 26 +++++++++++++++++++ 2 files changed, 74 insertions(+)drivers/media/v4l2-core/v4l2-common.c +7
-0@@ -392,3 +392,51 @@ void v4l2_get_timestamp(struct timeval *tv) tv->tv_usec = ts.tv_nsec /NSEC_PER_USEC ; }EXPORT_SYMBOL_GPL (v4l2_get_timestamp); + +int v4l2_g_parm_cap (struct video_device *vdev, +struct v4l2_subdev *sd,struct v4l2_streamparm *a) +{ +struct v4l2_subdev_frame_interval ival = {0 }; +int ret; +Quoted 8 lines
drivers/media/v4l2-core/v4l2-common.c void v4l2_get_timestamp(struct timeval *tv) · line 407
Quoted 6 lines
drivers/media/v4l2-core/v4l2-common.c +6
-0+if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE && + a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) +return -EINVAL ; + +if (vdev->device_caps &V4L2_CAP_READWRITE ) + a->parm.capture.readbuffers =2 ;Hmm... why don't you also initialize readbuffers otherwise?
Quoted 2 lines
It's specifically for
read(). Ifread()is not supported, then this is meaningless and should just stay 0. v4l2-compliance checks for this.
Quoted 6 lines
Well, API states that:
"When an application requests zero buffers, drivers should just return the current setting rather than the minimum or an error code."
So, something should zero it, if not used and type is capture or
capture_mplane.
All fields after the type field are zeroed by the core in v4l2-ioctl.c:
IOCTL_INFO_FNC(VIDIOC_G_PARM, v4l_g_parm, v4l_print_streamparm, INFO_FL_CLEAR(v4l2_streamparm, type)),
Quoted 10 lines
Quoted 4 lines
The 'readbuffers' field is completely outdated and once this is in the next step is to see if we can come up with something better. I hate G/S_PARM.
Yes, it is a weird ioctl, but I'm not yet convinced that we should increase API complexity by adding newer ioctls due to that.
Instead, I would just get rid of .g_parm/.s_parm callbacks, implementing a better kAPI, without bothering adding more complexity to uAPI.
I will probably do that as a second step anyway. We can discuss the pros and cons of adding a new ioctl after that. I rather like the VIDIOC_SUBDEV_G/S_FRAME_INTERVAL ioctls. Simple and to the point. It's really what you would expect as an end-user.
Regards,
Hans
PATCH v2 2/9 media: convert g/s_parm to g/s_frame_interval in subdevs
In reply to Hans VerkuilFrom: Hans Verkuil <[email protected]>
Convert all g/s_parm calls to g/s_frame_interval. This allows us to remove the g/s_parm ops since those are a duplicate of g/s_frame_interval.
--- drivers/media/i2c/mt9v011.c | 31 +++++++------------- drivers/media/i2c/ov6650.c | 35 +++++++++------------- drivers/media/i2c/ov7670.c | 24 +++++++-------- drivers/media/i2c/ov7740.c | 31 +++++++------------- drivers/media/i2c/tvp514x.c | 39 +++++++++---------------- drivers/media/i2c/vs6624.c | 29 +++++++----------- drivers/media/platform/atmel/atmel-isc.c | 10 ++----- drivers/media/platform/atmel/atmel-isi.c | 12 ++------ drivers/media/platform/blackfin/bfin_capture.c | 14 +++------ drivers/media/platform/marvell-ccic/mcam-core.c | 12 ++++---- drivers/media/platform/soc_camera/soc_camera.c | 10 ++++--- drivers/media/platform/via-camera.c | 4 +-- drivers/media/usb/em28xx/em28xx-video.c | 36 +++++++++++++++++++---- 13 files changed, 122 insertions(+), 165 deletions(-)
drivers/media/i2c/mt9v011.c +11 -20
@@ -364,33 +364,24 @@ static int mt9v011_set_fmt(struct v4l2_subdev *sd,return 0 ; } -static int mt9v011_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int mt9v011_g_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) { -struct v4l2_captureparm *cp = &parms->parm.capture; - -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -memset (cp,0 ,sizeof (struct v4l2_captureparm )); - cp->capability =V4L2_CAP_TIMEPERFRAME ; +memset (ival->reserved,0 ,sizeof (ival->reserved));calc_fps (sd, - &cp->timeperframe.numerator, - &cp->timeperframe.denominator); + &ival->interval.numerator, + &ival->interval.denominator);return 0 ; } -static int mt9v011_s_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int mt9v011_s_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) { -struct v4l2_captureparm *cp = &parms->parm.capture; -struct v4l2_fract *tpf = &cp->timeperframe; +struct v4l2_fract *tpf = &ival->interval;u16 speed; -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; -if (cp->extendedmode !=0 ) -return -EINVAL ; - +memset (ival->reserved,0 ,sizeof (ival->reserved)); speed =calc_speed (sd, tpf->numerator, tpf->denominator);mt9v011_write (sd,R0A_MT9V011_CLK_SPEED , speed);
@@ -469,8 +460,8 @@ static const struct v4l2_subdev_core_ops mt9v011_core_ops = { };static const struct v4l2_subdev_video_ops mt9v011_video_ops = { - .g_parm = mt9v011_g_parm, - .s_parm = mt9v011_s_parm, + .g_frame_interval = mt9v011_g_frame_interval, + .s_frame_interval = mt9v011_s_frame_interval, };static const struct v4l2_subdev_pad_ops mt9v011_pad_ops = {
drivers/media/i2c/ov6650.c +13 -22
@@ -201,7 +201,7 @@ struct ov6650 {struct v4l2_rect rect;/* sensor cropping window */ unsigned long pclk_limit;/* from host */ unsigned long pclk_max;/* from resolution and format */ -struct v4l2_fract tpf;/* as requested with s_parm */ +struct v4l2_fract tpf;/* as requested with s_frame_interval */ u32 code;enum v4l2_colorspace colorspace; };
@@ -723,42 +723,33 @@ static int ov6650_enum_mbus_code(struct v4l2_subdev *sd,return 0 ; } -static int ov6650_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int ov6650_g_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) {struct i2c_client *client =v4l2_get_subdevdata (sd);struct ov6650 *priv =to_ov6650 (client); -struct v4l2_captureparm *cp = &parms->parm.capture; -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -memset (cp,0 ,sizeof (*cp)); - cp->capability =V4L2_CAP_TIMEPERFRAME ; - cp->timeperframe.numerator =GET_CLKRC_DIV (to_clkrc (&priv->tpf, +memset (ival->reserved,0 ,sizeof (ival->reserved)); + ival->interval.numerator =GET_CLKRC_DIV (to_clkrc (&priv->tpf, priv->pclk_limit, priv->pclk_max)); - cp->timeperframe.denominator =FRAME_RATE_MAX ; + ival->interval.denominator =FRAME_RATE_MAX ;dev_dbg (&client->dev,"Frame interval: %u/%u s\n" , - cp->timeperframe.numerator, cp->timeperframe.denominator); + ival->interval.numerator, ival->interval.denominator);return 0 ; } -static int ov6650_s_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int ov6650_s_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) {struct i2c_client *client =v4l2_get_subdevdata (sd);struct ov6650 *priv =to_ov6650 (client); -struct v4l2_captureparm *cp = &parms->parm.capture; -struct v4l2_fract *tpf = &cp->timeperframe; +struct v4l2_fract *tpf = &ival->interval;int div, ret;u8 clkrc; -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -if (cp->extendedmode !=0 ) -return -EINVAL ; - +memset (ival->reserved,0 ,sizeof (ival->reserved));if (tpf->numerator ==0 || tpf->denominator ==0 ) div =1 ;/* Reset to full rate */ else
@@ -921,8 +912,8 @@ static int ov6650_s_mbus_config(struct v4l2_subdev *sd,static const struct v4l2_subdev_video_ops ov6650_video_ops = { .s_stream = ov6650_s_stream, - .g_parm = ov6650_g_parm, - .s_parm = ov6650_s_parm, + .g_frame_interval = ov6650_g_frame_interval, + .s_frame_interval = ov6650_s_frame_interval, .g_mbus_config = ov6650_g_mbus_config, .s_mbus_config = ov6650_s_mbus_config, };
drivers/media/i2c/ov7670.c +10 -14
@@ -1100,30 +1100,26 @@ static int ov7670_get_fmt(struct v4l2_subdev *sd,* Implement G/S_PARM. There is a "high quality" mode we could try * to do someday; for now, we just do the frame rate tweak. */ -static int ov7670_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int ov7670_g_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) { -struct v4l2_captureparm *cp = &parms->parm.capture;struct ov7670_info *info =to_state (sd); -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; +memset (ival->reserved,0 ,sizeof (ival->reserved)); - cp->capability =V4L2_CAP_TIMEPERFRAME ; - info->devtype->get_framerate (sd, &cp->timeperframe); + info->devtype->get_framerate (sd, &ival->interval);return 0 ; } -static int ov7670_s_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int ov7670_s_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) { -struct v4l2_captureparm *cp = &parms->parm.capture; -struct v4l2_fract *tpf = &cp->timeperframe; +struct v4l2_fract *tpf = &ival->interval;struct ov7670_info *info =to_state (sd); -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; +memset (ival->reserved,0 ,sizeof (ival->reserved)); - cp->capability =V4L2_CAP_TIMEPERFRAME ;return info->devtype->set_framerate (sd, tpf); }
@@ -1636,8 +1632,8 @@ static const struct v4l2_subdev_core_ops ov7670_core_ops = { };static const struct v4l2_subdev_video_ops ov7670_video_ops = { - .s_parm = ov7670_s_parm, - .g_parm = ov7670_g_parm, + .s_frame_interval = ov7670_s_frame_interval, + .g_frame_interval = ov7670_g_frame_interval, };static const struct v4l2_subdev_pad_ops ov7670_pad_ops = {
drivers/media/i2c/ov7740.c +10 -21
@@ -624,17 +624,12 @@ static int ov7740_set_stream(struct v4l2_subdev *sd, int enable)return ret; } -static int ov7740_get_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *parms) +static int ov7740_g_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) { -struct v4l2_captureparm *cp = &parms->parm.capture; -struct v4l2_fract *tpf = &cp->timeperframe; +struct v4l2_fract *tpf = &ival->interval; -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -memset (cp,0 ,sizeof (struct v4l2_captureparm )); - cp->capability =V4L2_CAP_TIMEPERFRAME ; +memset (ival->reserved,0 ,sizeof (ival->reserved)); tpf->numerator =1 ; tpf->denominator =60 ;
@@ -642,18 +637,12 @@ static int ov7740_get_parm(struct v4l2_subdev *sd,return 0 ; } -static int ov7740_set_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *parms) +static int ov7740_s_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) { -struct v4l2_captureparm *cp = &parms->parm.capture; -struct v4l2_fract *tpf = &cp->timeperframe; - -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; -if (cp->extendedmode !=0 ) -return -EINVAL ; +struct v4l2_fract *tpf = &ival->interval; - cp->capability =V4L2_CAP_TIMEPERFRAME ; +memset (ival->reserved,0 ,sizeof (ival->reserved)); tpf->numerator =1 ; tpf->denominator =60 ;
@@ -663,8 +652,8 @@ static int ov7740_set_parm(struct v4l2_subdev *sd,static struct v4l2_subdev_video_ops ov7740_subdev_video_ops = { .s_stream = ov7740_set_stream, - .s_parm = ov7740_set_parm, - .g_parm = ov7740_get_parm, + .s_frame_interval = ov7740_s_frame_interval, + .g_frame_interval = ov7740_g_frame_interval, };static const struct reg_sequence ov7740_format_yuyv[] = {
drivers/media/i2c/tvp514x.c +14 -25
@@ -747,60 +747,49 @@ static int tvp514x_s_ctrl(struct v4l2_ctrl *ctrl) }/** -* tvp514x_g_parm() - V4L2 decoder interface handler for g_parm +* tvp514x_g_frame_interval() - V4L2 decoder interface handler * @sd: pointer to standard V4L2 sub-device structure -* @a: pointer to standard V4L2 VIDIOC_G_PARM ioctl structure +* @a: pointer to a v4l2_subdev_frame_interval structure * * Returns the decoder's video CAPTURE parameters. */ static int -tvp514x_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *a) +tvp514x_g_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) {struct tvp514x_decoder *decoder =to_decoder (sd); -struct v4l2_captureparm *cparm;enum tvp514x_std current_std; -if (a ==NULL ) -return -EINVAL ; - -if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -/* only capture is supported */ -return -EINVAL ; +memset (ival->reserved,0 ,sizeof (ival->reserved));/* get the current standard */ current_std = decoder->current_std; - cparm = &a->parm.capture; - cparm->capability =V4L2_CAP_TIMEPERFRAME ; - cparm->timeperframe = + ival->interval = decoder->std_list[current_std].standard.frameperiod;return 0 ; }/** -* tvp514x_s_parm() - V4L2 decoder interface handler for s_parm +* tvp514x_s_frame_interval() - V4L2 decoder interface handler * @sd: pointer to standard V4L2 sub-device structure -* @a: pointer to standard V4L2 VIDIOC_S_PARM ioctl structure +* @a: pointer to a v4l2_subdev_frame_interval structure * * Configures the decoder to use the input parameters, if possible. If * not possible, returns the appropriate error code. */ static int -tvp514x_s_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *a) +tvp514x_s_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) {struct tvp514x_decoder *decoder =to_decoder (sd);struct v4l2_fract *timeperframe;enum tvp514x_std current_std; -if (a ==NULL ) -return -EINVAL ; - -if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -/* only capture is supported */ -return -EINVAL ; +memset (ival->reserved,0 ,sizeof (ival->reserved)); - timeperframe = &a->parm.capture.timeperframe; + timeperframe = &ival->interval;/* get the current standard */ current_std = decoder->current_std;
@@ -961,8 +950,8 @@ static const struct v4l2_subdev_video_ops tvp514x_video_ops = { .s_std = tvp514x_s_std, .s_routing = tvp514x_s_routing, .querystd = tvp514x_querystd, - .g_parm = tvp514x_g_parm, - .s_parm = tvp514x_s_parm, + .g_frame_interval = tvp514x_g_frame_interval, + .s_frame_interval = tvp514x_s_frame_interval, .s_stream = tvp514x_s_stream, };
drivers/media/i2c/vs6624.c +11 -18
@@ -657,31 +657,24 @@ static int vs6624_get_fmt(struct v4l2_subdev *sd,return 0 ; } -static int vs6624_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int vs6624_g_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) {struct vs6624 *sensor =to_vs6624 (sd); -struct v4l2_captureparm *cp = &parms->parm.capture; -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -memset (cp,0 ,sizeof (*cp)); - cp->capability =V4L2_CAP_TIMEPERFRAME ; - cp->timeperframe.numerator = sensor->frame_rate.denominator; - cp->timeperframe.denominator = sensor->frame_rate.numerator; +memset (ival->reserved,0 ,sizeof (ival->reserved)); + ival->interval.numerator = sensor->frame_rate.denominator; + ival->interval.denominator = sensor->frame_rate.numerator;return 0 ; } -static int vs6624_s_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int vs6624_s_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) {struct vs6624 *sensor =to_vs6624 (sd); -struct v4l2_captureparm *cp = &parms->parm.capture; -struct v4l2_fract *tpf = &cp->timeperframe; +struct v4l2_fract *tpf = &ival->interval; -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; -if (cp->extendedmode !=0 ) -return -EINVAL ; +memset (ival->reserved,0 ,sizeof (ival->reserved));if (tpf->numerator ==0 || tpf->denominator ==0 || (tpf->denominator > tpf->numerator *MAX_FRAME_RATE )) {
@@ -738,8 +731,8 @@ static const struct v4l2_subdev_core_ops vs6624_core_ops = { };static const struct v4l2_subdev_video_ops vs6624_video_ops = { - .s_parm = vs6624_s_parm, - .g_parm = vs6624_g_parm, + .s_frame_interval = vs6624_s_frame_interval, + .g_frame_interval = vs6624_g_frame_interval, .s_stream = vs6624_s_stream, };
drivers/media/platform/atmel/atmel-isc.c +2 -8
@@ -1417,20 +1417,14 @@ static int isc_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a) {struct isc_device *isc =video_drvdata (file); -if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -return v4l2_subdev_call (isc->current_subdev->sd, video, g_parm, a); +return v4l2_g_parm_cap (video_devdata (file), isc->current_subdev->sd, a); }static int isc_s_parm (struct file *file,void *fh,struct v4l2_streamparm *a) {struct isc_device *isc =video_drvdata (file); -if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -return v4l2_subdev_call (isc->current_subdev->sd, video, s_parm, a); +return v4l2_s_parm_cap (video_devdata (file), isc->current_subdev->sd, a); } static int isc_enum_framesizes(struct file *file, void *fh,
drivers/media/platform/atmel/atmel-isi.c +2 -10
@@ -689,22 +689,14 @@ static int isi_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a) {struct atmel_isi *isi =video_drvdata (file); -if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - - a->parm.capture.readbuffers =2 ; -return v4l2_subdev_call (isi->entity.subdev, video, g_parm, a); +return v4l2_g_parm_cap (video_devdata (file), isi->entity.subdev, a); }static int isi_s_parm (struct file *file,void *fh,struct v4l2_streamparm *a) {struct atmel_isi *isi =video_drvdata (file); -if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - - a->parm.capture.readbuffers =2 ; -return v4l2_subdev_call (isi->entity.subdev, video, s_parm, a); +return v4l2_s_parm_cap (video_devdata (file), isi->entity.subdev, a); } static int isi_enum_framesizes(struct file *file, void *fh,
drivers/media/platform/blackfin/bfin_capture.c +4 -10
@@ -712,24 +712,18 @@ static int bcap_querycap(struct file *file, void *priv,return 0 ; } -static int bcap_g_parm (struct file *file,void *fh, -struct v4l2_streamparm *a) +static int bcap_g_parm (struct file *file,void *fh,struct v4l2_streamparm *a) {struct bcap_device *bcap_dev =video_drvdata (file); -if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; -return v4l2_subdev_call (bcap_dev->sd, video, g_parm, a); +return v4l2_g_parm_cap (video_devdata (file), bcap_dev->sd, a); } -static int bcap_s_parm (struct file *file,void *fh, -struct v4l2_streamparm *a) +static int bcap_s_parm (struct file *file,void *fh,struct v4l2_streamparm *a) {struct bcap_device *bcap_dev =video_drvdata (file); -if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; -return v4l2_subdev_call (bcap_dev->sd, video, s_parm, a); +return v4l2_s_parm_cap (video_devdata (file), bcap_dev->sd, a); }static int bcap_log_status (struct file *file,void *priv)
drivers/media/platform/marvell-ccic/mcam-core.c +6 -6
@@ -1443,24 +1443,24 @@ static int mcam_vidioc_s_input(struct file *filp, void *priv, unsigned int i)* the level which controls the number of read buffers. */ static int mcam_vidioc_g_parm (struct file *filp,void *priv, -struct v4l2_streamparm *parms) +struct v4l2_streamparm *a) {struct mcam_camera *cam =video_drvdata (filp);int ret; - ret =sensor_call (cam, video, g_parm, parms); - parms->parm.capture.readbuffers = n_dma_bufs; + ret =v4l2_g_parm_cap (video_devdata (filp), cam->sensor, a); + a->parm.capture.readbuffers = n_dma_bufs;return ret; }static int mcam_vidioc_s_parm (struct file *filp,void *priv, -struct v4l2_streamparm *parms) +struct v4l2_streamparm *a) {struct mcam_camera *cam =video_drvdata (filp);int ret; - ret =sensor_call (cam, video, s_parm, parms); - parms->parm.capture.readbuffers = n_dma_bufs; + ret =v4l2_s_parm_cap (video_devdata (filp), cam->sensor, a); + a->parm.capture.readbuffers = n_dma_bufs;return ret; }
drivers/media/platform/soc_camera/soc_camera.c +6 -4
@@ -1788,17 +1788,19 @@ static int default_s_selection(struct soc_camera_device *icd, }static int default_g_parm (struct soc_camera_device *icd, -struct v4l2_streamparm *parm) +struct v4l2_streamparm *a) {struct v4l2_subdev *sd =soc_camera_to_subdev (icd); -return v4l2_subdev_call (sd, video, g_parm, parm); + +return v4l2_g_parm_cap (icd->vdev, sd, a); }static int default_s_parm (struct soc_camera_device *icd, -struct v4l2_streamparm *parm) +struct v4l2_streamparm *a) {struct v4l2_subdev *sd =soc_camera_to_subdev (icd); -return v4l2_subdev_call (sd, video, s_parm, parm); + +return v4l2_s_parm_cap (icd->vdev, sd, a); } static int default_enum_framesizes(struct soc_camera_device *icd,
drivers/media/platform/via-camera.c +2 -2
@@ -1112,7 +1112,7 @@ static int viacam_g_parm(struct file *filp, void *priv,int ret;mutex_lock (&cam->lock); - ret =sensor_call (cam, video, g_parm, parm); + ret =v4l2_g_parm_cap (video_devdata (filp), cam->sensor, parm);mutex_unlock (&cam->lock); parm->parm.capture.readbuffers = cam->n_cap_bufs;return ret;
@@ -1125,7 +1125,7 @@ static int viacam_s_parm(struct file *filp, void *priv,int ret;mutex_lock (&cam->lock); - ret =sensor_call (cam, video, s_parm, parm); + ret =v4l2_s_parm_cap (video_devdata (filp), cam->sensor, parm);mutex_unlock (&cam->lock); parm->parm.capture.readbuffers = cam->n_cap_bufs;return ret;
drivers/media/usb/em28xx/em28xx-video.c +31 -5
@@ -1582,17 +1582,26 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id norm)static int vidioc_g_parm (struct file *file,void *priv,struct v4l2_streamparm *p) { +struct v4l2_subdev_frame_interval ival = {0 };struct em28xx *dev =video_drvdata (file);struct em28xx_v4l2 *v4l2 = dev->v4l2;int rc =0 ; +if (p->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE && + p->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) +return -EINVAL ; + p->parm.capture.readbuffers =EM28XX_MIN_BUF ; -if (dev->board.is_webcam) + p->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; +if (dev->board.is_webcam) { rc =v4l2_device_call_until_err (&v4l2->v4l2_dev,0 , - video, g_parm, p); -else + video, g_frame_interval, &ival); +if (!rc) + p->parm.capture.timeperframe = ival.interval; + }else {v4l2_video_std_frame_period (v4l2->norm, &p->parm.capture.timeperframe); + }return rc; }
@@ -1601,10 +1610,27 @@ static int vidioc_s_parm(struct file *file, void *priv, struct v4l2_streamparm *p) {struct em28xx *dev =video_drvdata (file); +struct v4l2_subdev_frame_interval ival = { +0 , + p->parm.capture.timeperframe + }; +int rc =0 ; + +if (!dev->board.is_webcam) +return -ENOTTY ; +if (p->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE && + p->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) +return -EINVAL ; + +memset (&p->parm,0 ,sizeof (p->parm)); p->parm.capture.readbuffers =EM28XX_MIN_BUF ; -return v4l2_device_call_until_err (&dev->v4l2->v4l2_dev, -0 , video, s_parm, p); + p->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; + rc =v4l2_device_call_until_err (&dev->v4l2->v4l2_dev,0 , + video, s_frame_interval, &ival); +if (!rc) + p->parm.capture.timeperframe = ival.interval; +return rc; } static int vidioc_enum_input(struct file *file, void *priv,
Signature · 1 line
2.15.1
Re: [PATCHv2 2/9] media: convert g/s_parm to g/s_frame_interval in subdevs
Hi Hans,
Quoted 12 lines · Hans Verkuil
From: Hans Verkuil <[email protected]>
drivers/media/platform/atmel/atmel-isi.c +0
-4@@ -689,22 +689,14 @@ static int isi_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a) {struct atmel_isi *isi =video_drvdata (file); -if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - - a->parm.capture.readbuffers =2 ;
drivers/media/platform/atmel/atmel-isi.c static int isi_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a) · line 704
Quoted 10 lines
drivers/media/platform/atmel/atmel-isi.c +1
-3-return v4l2_subdev_call (isi->entity.subdev, video, g_parm, a); +return v4l2_g_parm_cap (video_devdata (file), isi->entity.subdev, a); }static int isi_s_parm (struct file *file,void *fh,struct v4l2_streamparm *a) {struct atmel_isi *isi =video_drvdata (file); -if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ;
I've now tested the right version with CEU, and v4l2-compliance reports:
fail: v4l2-test-formats.cpp(1218): Video Capture cap not set, but G/S_PARM worked
To get rid of this error I had to refuse V4L2_BUF_TYPE_VIDEO_CAPTURE type in g/s_parm as my driver only supports VIDEO_CAPTURE_MPLANE type.
static int ceu_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
{
struct ceu_device *ceudev = video_drvdata(file);
if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
return -EINVAL;
return v4l2_s_parm_cap(video_devdata(file), ceudev->sd->v4l2_sd, a);
}To make sure the same error does not happen for atmel-isi/isc and other platform drivers this patch modifies, I would keep the checks on a->type you have removed here.
I now wonder if the following test in the newly added v4l2_g/s_parm_cap() still makes sense if platform drivers have to check for the correct buffer type anyhow (the same for the _cap name suffix)
int v4l2_g_parm_cap(struct video_device *vdev,
struct v4l2_subdev *sd, struct v4l2_streamparm *a)
{
struct v4l2_subdev_frame_interval ival = { 0 };
int ret;
if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
return -EINVAL;Thanks
j
Quoted 192 lines
drivers/media/platform/atmel/atmel-isi.c +1
-3- - a->parm.capture.readbuffers =2 ; -return v4l2_subdev_call (isi->entity.subdev, video, s_parm, a); +return v4l2_s_parm_cap (video_devdata (file), isi->entity.subdev, a); } static int isi_enum_framesizes(struct file *file, void *fh,drivers/media/platform/blackfin/bfin_capture.c +4
-10@@ -712,24 +712,18 @@ static int bcap_querycap(struct file *file, void *priv,return 0 ; } -static int bcap_g_parm (struct file *file,void *fh, -struct v4l2_streamparm *a) +static int bcap_g_parm (struct file *file,void *fh,struct v4l2_streamparm *a) {struct bcap_device *bcap_dev =video_drvdata (file); -if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; -return v4l2_subdev_call (bcap_dev->sd, video, g_parm, a); +return v4l2_g_parm_cap (video_devdata (file), bcap_dev->sd, a); } -static int bcap_s_parm (struct file *file,void *fh, -struct v4l2_streamparm *a) +static int bcap_s_parm (struct file *file,void *fh,struct v4l2_streamparm *a) {struct bcap_device *bcap_dev =video_drvdata (file); -if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; -return v4l2_subdev_call (bcap_dev->sd, video, s_parm, a); +return v4l2_s_parm_cap (video_devdata (file), bcap_dev->sd, a); }static int bcap_log_status (struct file *file,void *priv)drivers/media/platform/marvell-ccic/mcam-core.c +6
-6@@ -1443,24 +1443,24 @@ static int mcam_vidioc_s_input(struct file *filp, void *priv, unsigned int i)* the level which controls the number of read buffers. */ static int mcam_vidioc_g_parm (struct file *filp,void *priv, -struct v4l2_streamparm *parms) +struct v4l2_streamparm *a) {struct mcam_camera *cam =video_drvdata (filp);int ret; - ret =sensor_call (cam, video, g_parm, parms); - parms->parm.capture.readbuffers = n_dma_bufs; + ret =v4l2_g_parm_cap (video_devdata (filp), cam->sensor, a); + a->parm.capture.readbuffers = n_dma_bufs;return ret; }static int mcam_vidioc_s_parm (struct file *filp,void *priv, -struct v4l2_streamparm *parms) +struct v4l2_streamparm *a) {struct mcam_camera *cam =video_drvdata (filp);int ret; - ret =sensor_call (cam, video, s_parm, parms); - parms->parm.capture.readbuffers = n_dma_bufs; + ret =v4l2_s_parm_cap (video_devdata (filp), cam->sensor, a); + a->parm.capture.readbuffers = n_dma_bufs;return ret; }drivers/media/platform/soc_camera/soc_camera.c +6
-4@@ -1788,17 +1788,19 @@ static int default_s_selection(struct soc_camera_device *icd, }static int default_g_parm (struct soc_camera_device *icd, -struct v4l2_streamparm *parm) +struct v4l2_streamparm *a) {struct v4l2_subdev *sd =soc_camera_to_subdev (icd); -return v4l2_subdev_call (sd, video, g_parm, parm); + +return v4l2_g_parm_cap (icd->vdev, sd, a); }static int default_s_parm (struct soc_camera_device *icd, -struct v4l2_streamparm *parm) +struct v4l2_streamparm *a) {struct v4l2_subdev *sd =soc_camera_to_subdev (icd); -return v4l2_subdev_call (sd, video, s_parm, parm); + +return v4l2_s_parm_cap (icd->vdev, sd, a); } static int default_enum_framesizes(struct soc_camera_device *icd,drivers/media/platform/via-camera.c +2
-2@@ -1112,7 +1112,7 @@ static int viacam_g_parm(struct file *filp, void *priv,int ret;mutex_lock (&cam->lock); - ret =sensor_call (cam, video, g_parm, parm); + ret =v4l2_g_parm_cap (video_devdata (filp), cam->sensor, parm);mutex_unlock (&cam->lock); parm->parm.capture.readbuffers = cam->n_cap_bufs;return ret;@@ -1125,7 +1125,7 @@ static int viacam_s_parm(struct file *filp, void *priv,int ret;mutex_lock (&cam->lock); - ret =sensor_call (cam, video, s_parm, parm); + ret =v4l2_s_parm_cap (video_devdata (filp), cam->sensor, parm);mutex_unlock (&cam->lock); parm->parm.capture.readbuffers = cam->n_cap_bufs;return ret;drivers/media/usb/em28xx/em28xx-video.c +31
-6@@ -1582,17 +1582,26 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id norm)static int vidioc_g_parm (struct file *file,void *priv,struct v4l2_streamparm *p) { +struct v4l2_subdev_frame_interval ival = {0 };struct em28xx *dev =video_drvdata (file);struct em28xx_v4l2 *v4l2 = dev->v4l2;int rc =0 ; +if (p->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE && + p->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) +return -EINVAL ; + p->parm.capture.readbuffers =EM28XX_MIN_BUF ; -if (dev->board.is_webcam) + p->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; +if (dev->board.is_webcam) { rc =v4l2_device_call_until_err (&v4l2->v4l2_dev,0 , - video, g_parm, p); -else + video, g_frame_interval, &ival); +if (!rc) + p->parm.capture.timeperframe = ival.interval; + }else {v4l2_video_std_frame_period (v4l2->norm, &p->parm.capture.timeperframe); + }return rc; }@@ -1601,10 +1610,27 @@ static int vidioc_s_parm(struct file *file, void *priv, struct v4l2_streamparm *p) {struct em28xx *dev =video_drvdata (file); +struct v4l2_subdev_frame_interval ival = { +0 , + p->parm.capture.timeperframe + }; +int rc =0 ; + +if (!dev->board.is_webcam) +return -ENOTTY ; +if (p->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE && + p->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) +return -EINVAL ; + +memset (&p->parm,0 ,sizeof (p->parm)); p->parm.capture.readbuffers =EM28XX_MIN_BUF ; -return v4l2_device_call_until_err (&dev->v4l2->v4l2_dev, -0 , video, s_parm, p); + p->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; + rc =v4l2_device_call_until_err (&dev->v4l2->v4l2_dev,0 , + video, s_frame_interval, &ival); +if (!rc) + p->parm.capture.timeperframe = ival.interval; +return rc; } static int vidioc_enum_input(struct file *file, void *priv, --2.15.1
Re: [PATCHv2 2/9] media: convert g/s_parm to g/s_frame_interval in subdevs
Quoted 23 lines · jacopo mondi
Hi Hans,
Quoted 20 lines · Hans Verkuil
From: Hans Verkuil <[email protected]>
drivers/media/platform/atmel/atmel-isi.c +1
-5@@ -689,22 +689,14 @@ static int isi_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a) {struct atmel_isi *isi =video_drvdata (file); -if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - - a->parm.capture.readbuffers =2 ; -return v4l2_subdev_call (isi->entity.subdev, video, g_parm, a); +return v4l2_g_parm_cap (video_devdata (file), isi->entity.subdev, a); }static int isi_s_parm (struct file *file,void *fh,struct v4l2_streamparm *a) {struct atmel_isi *isi =video_drvdata (file);
Quoted 8 lines
drivers/media/platform/atmel/atmel-isi.c static int isi_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a) · line 704
Quoted 2 lines
drivers/media/platform/atmel/atmel-isi.c +0
-2-if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ;I've now tested the right version with CEU, and v4l2-compliance reports:
fail: v4l2-test-formats.cpp(1218): Video Capture cap not set, but G/S_PARM worked
Oops, that's a bug in v4l2-compliance. The public API for g/s_parm has been relaxed a bit by this patch in that we now allow both CAPTURE and CAPTURE_MPLANE. But v4l2-compliance hasn't been updated for that change yet.
Regards,
Hans
Quoted 227 lines
To get rid of this error I had to refuse
V4L2_BUF_TYPE_VIDEO_CAPTUREtype in g/s_parm as my driver only supportsVIDEO_CAPTURE_MPLANEtype.static int
ceu_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a){ struct ceu_device *ceudev = video_drvdata(file); if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) return -EINVAL; return v4l2_s_parm_cap(video_devdata(file), ceudev->sd->v4l2_sd, a); }To make sure the same error does not happen for atmel-isi/isc and other platform drivers this patch modifies, I would keep the checks on
a->typeyou have removed here.I now wonder if the following test in the newly added v4l2_g/s_parm_cap() still makes sense if platform drivers have to check for the correct buffer type anyhow (the same for the
_capname suffix)int v4l2_g_parm_cap(struct
video_device*vdev,
structv4l2_subdev*sd, structv4l2_streamparm*a){ struct v4l2_subdev_frame_interval ival = { 0 }; int ret; if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE && a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) return -EINVAL;Thanks
jQuoted 192 lines
drivers/media/platform/atmel/atmel-isi.c +1
-3- - a->parm.capture.readbuffers =2 ; -return v4l2_subdev_call (isi->entity.subdev, video, s_parm, a); +return v4l2_s_parm_cap (video_devdata (file), isi->entity.subdev, a); } static int isi_enum_framesizes(struct file *file, void *fh,drivers/media/platform/blackfin/bfin_capture.c +4
-10@@ -712,24 +712,18 @@ static int bcap_querycap(struct file *file, void *priv,return 0 ; } -static int bcap_g_parm (struct file *file,void *fh, -struct v4l2_streamparm *a) +static int bcap_g_parm (struct file *file,void *fh,struct v4l2_streamparm *a) {struct bcap_device *bcap_dev =video_drvdata (file); -if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; -return v4l2_subdev_call (bcap_dev->sd, video, g_parm, a); +return v4l2_g_parm_cap (video_devdata (file), bcap_dev->sd, a); } -static int bcap_s_parm (struct file *file,void *fh, -struct v4l2_streamparm *a) +static int bcap_s_parm (struct file *file,void *fh,struct v4l2_streamparm *a) {struct bcap_device *bcap_dev =video_drvdata (file); -if (a->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; -return v4l2_subdev_call (bcap_dev->sd, video, s_parm, a); +return v4l2_s_parm_cap (video_devdata (file), bcap_dev->sd, a); }static int bcap_log_status (struct file *file,void *priv)drivers/media/platform/marvell-ccic/mcam-core.c +6
-6@@ -1443,24 +1443,24 @@ static int mcam_vidioc_s_input(struct file *filp, void *priv, unsigned int i)* the level which controls the number of read buffers. */ static int mcam_vidioc_g_parm (struct file *filp,void *priv, -struct v4l2_streamparm *parms) +struct v4l2_streamparm *a) {struct mcam_camera *cam =video_drvdata (filp);int ret; - ret =sensor_call (cam, video, g_parm, parms); - parms->parm.capture.readbuffers = n_dma_bufs; + ret =v4l2_g_parm_cap (video_devdata (filp), cam->sensor, a); + a->parm.capture.readbuffers = n_dma_bufs;return ret; }static int mcam_vidioc_s_parm (struct file *filp,void *priv, -struct v4l2_streamparm *parms) +struct v4l2_streamparm *a) {struct mcam_camera *cam =video_drvdata (filp);int ret; - ret =sensor_call (cam, video, s_parm, parms); - parms->parm.capture.readbuffers = n_dma_bufs; + ret =v4l2_s_parm_cap (video_devdata (filp), cam->sensor, a); + a->parm.capture.readbuffers = n_dma_bufs;return ret; }drivers/media/platform/soc_camera/soc_camera.c +6
-4@@ -1788,17 +1788,19 @@ static int default_s_selection(struct soc_camera_device *icd, }static int default_g_parm (struct soc_camera_device *icd, -struct v4l2_streamparm *parm) +struct v4l2_streamparm *a) {struct v4l2_subdev *sd =soc_camera_to_subdev (icd); -return v4l2_subdev_call (sd, video, g_parm, parm); + +return v4l2_g_parm_cap (icd->vdev, sd, a); }static int default_s_parm (struct soc_camera_device *icd, -struct v4l2_streamparm *parm) +struct v4l2_streamparm *a) {struct v4l2_subdev *sd =soc_camera_to_subdev (icd); -return v4l2_subdev_call (sd, video, s_parm, parm); + +return v4l2_s_parm_cap (icd->vdev, sd, a); } static int default_enum_framesizes(struct soc_camera_device *icd,drivers/media/platform/via-camera.c +2
-2@@ -1112,7 +1112,7 @@ static int viacam_g_parm(struct file *filp, void *priv,int ret;mutex_lock (&cam->lock); - ret =sensor_call (cam, video, g_parm, parm); + ret =v4l2_g_parm_cap (video_devdata (filp), cam->sensor, parm);mutex_unlock (&cam->lock); parm->parm.capture.readbuffers = cam->n_cap_bufs;return ret;@@ -1125,7 +1125,7 @@ static int viacam_s_parm(struct file *filp, void *priv,int ret;mutex_lock (&cam->lock); - ret =sensor_call (cam, video, s_parm, parm); + ret =v4l2_s_parm_cap (video_devdata (filp), cam->sensor, parm);mutex_unlock (&cam->lock); parm->parm.capture.readbuffers = cam->n_cap_bufs;return ret;drivers/media/usb/em28xx/em28xx-video.c +31
-6@@ -1582,17 +1582,26 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id norm)static int vidioc_g_parm (struct file *file,void *priv,struct v4l2_streamparm *p) { +struct v4l2_subdev_frame_interval ival = {0 };struct em28xx *dev =video_drvdata (file);struct em28xx_v4l2 *v4l2 = dev->v4l2;int rc =0 ; +if (p->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE && + p->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) +return -EINVAL ; + p->parm.capture.readbuffers =EM28XX_MIN_BUF ; -if (dev->board.is_webcam) + p->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; +if (dev->board.is_webcam) { rc =v4l2_device_call_until_err (&v4l2->v4l2_dev,0 , - video, g_parm, p); -else + video, g_frame_interval, &ival); +if (!rc) + p->parm.capture.timeperframe = ival.interval; + }else {v4l2_video_std_frame_period (v4l2->norm, &p->parm.capture.timeperframe); + }return rc; }@@ -1601,10 +1610,27 @@ static int vidioc_s_parm(struct file *file, void *priv, struct v4l2_streamparm *p) {struct em28xx *dev =video_drvdata (file); +struct v4l2_subdev_frame_interval ival = { +0 , + p->parm.capture.timeperframe + }; +int rc =0 ; + +if (!dev->board.is_webcam) +return -ENOTTY ; +if (p->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE && + p->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ) +return -EINVAL ; + +memset (&p->parm,0 ,sizeof (p->parm)); p->parm.capture.readbuffers =EM28XX_MIN_BUF ; -return v4l2_device_call_until_err (&dev->v4l2->v4l2_dev, -0 , video, s_parm, p); + p->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; + rc =v4l2_device_call_until_err (&dev->v4l2->v4l2_dev,0 , + video, s_frame_interval, &ival); +if (!rc) + p->parm.capture.timeperframe = ival.interval; +return rc; } static int vidioc_enum_input(struct file *file, void *priv, --2.15.1
Re: [PATCHv2 2/9] media: convert g/s_parm to g/s_frame_interval in subdevs
In reply to Hans VerkuilEm Mon, 22 Jan 2018 13:31:18 +0100
Hans Verkuil <[email protected]> escreveu:
Quoted 33 lines
From: Hans Verkuil <[email protected]>
Convert all g/s_parm calls to g/s_frame_interval. This allows us to remove the g/s_parm ops since those are a duplicate of g/s_frame_interval.
Signed-off-by Hans Verkuil <[email protected]>--- drivers/media/i2c/mt9v011.c | 31 +++++++------------- drivers/media/i2c/ov6650.c | 35 +++++++++------------- drivers/media/i2c/ov7670.c | 24 +++++++-------- drivers/media/i2c/ov7740.c | 31 +++++++------------- drivers/media/i2c/tvp514x.c | 39 +++++++++---------------- drivers/media/i2c/vs6624.c | 29 +++++++----------- drivers/media/platform/atmel/atmel-isc.c | 10 ++----- drivers/media/platform/atmel/atmel-isi.c | 12 ++------ drivers/media/platform/blackfin/bfin_capture.c | 14 +++------ drivers/media/platform/marvell-ccic/mcam-core.c | 12 ++++---- drivers/media/platform/soc_camera/soc_camera.c | 10 ++++--- drivers/media/platform/via-camera.c | 4 +-- drivers/media/usb/em28xx/em28xx-video.c | 36 +++++++++++++++++++---- 13 files changed, 122 insertions(+), 165 deletions(-)drivers/media/i2c/mt9v011.c +1
-1@@ -364,33 +364,24 @@ static int mt9v011_set_fmt(struct v4l2_subdev *sd,return 0 ; } -static int mt9v011_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int mt9v011_g_frame_interval(struct v4l2_subdev *sd,
drivers/media/i2c/mt9v011.c static int mt9v011_set_fmt(struct v4l2_subdev *sd, · line 370
Quoted 10 lines
drivers/media/i2c/mt9v011.c +2
-7+ struct v4l2_subdev_frame_interval *ival) { -struct v4l2_captureparm *cp = &parms->parm.capture; - -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -memset (cp,0 ,sizeof (struct v4l2_captureparm )); - cp->capability =V4L2_CAP_TIMEPERFRAME ; +memset (ival->reserved,0 ,sizeof (ival->reserved));
Hmm.. why to repeat memset everywhere? If the hole idea is to stop abusing, the best would be to do, instead:
drivers/media/v4l2-core/v4l2-subdev.c +1 -0
@@ -350,6 +350,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)if (fi->pad >= sd->entity.num_pads)return -EINVAL ; +memset (fi->reserved,0 ,sizeof (ival->reserved));return v4l2_subdev_call (sd, video, g_frame_interval, arg); }
(same applies to s_frame_interval).
Quoted 13 lines
drivers/media/i2c/mt9v011.c +4
-3calc_fps (sd, - &cp->timeperframe.numerator, - &cp->timeperframe.denominator); + &ival->interval.numerator, + &ival->interval.denominator);return 0 ; } -static int mt9v011_s_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int mt9v011_s_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) {
drivers/media/i2c/mt9v011.c static int mt9v011_set_fmt(struct v4l2_subdev *sd, · line 393
Quoted 10 lines
drivers/media/i2c/mt9v011.c +1
-7-struct v4l2_captureparm *cp = &parms->parm.capture; -struct v4l2_fract *tpf = &cp->timeperframe; +struct v4l2_fract *tpf = &ival->interval;u16 speed; -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; -if (cp->extendedmode !=0 ) -return -EINVAL ; -
Hmm... why are you removing those sanity checks everywhere? The core doesn't do it.
All the above comments also apply to the other files modified by this patch.
Quoted 45 lines
drivers/media/i2c/mt9v011.c +3
-2+memset (ival->reserved,0 ,sizeof (ival->reserved)); speed =calc_speed (sd, tpf->numerator, tpf->denominator);mt9v011_write (sd,R0A_MT9V011_CLK_SPEED , speed);@@ -469,8 +460,8 @@ static const struct v4l2_subdev_core_ops mt9v011_core_ops = { };static const struct v4l2_subdev_video_ops mt9v011_video_ops = { - .g_parm = mt9v011_g_parm, - .s_parm = mt9v011_s_parm, + .g_frame_interval = mt9v011_g_frame_interval, + .s_frame_interval = mt9v011_s_frame_interval, };static const struct v4l2_subdev_pad_ops mt9v011_pad_ops = {drivers/media/i2c/ov6650.c +3
-8@@ -201,7 +201,7 @@ struct ov6650 {struct v4l2_rect rect;/* sensor cropping window */ unsigned long pclk_limit;/* from host */ unsigned long pclk_max;/* from resolution and format */ -struct v4l2_fract tpf;/* as requested with s_parm */ +struct v4l2_fract tpf;/* as requested with s_frame_interval */ u32 code;enum v4l2_colorspace colorspace; };@@ -723,42 +723,33 @@ static int ov6650_enum_mbus_code(struct v4l2_subdev *sd,return 0 ; } -static int ov6650_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int ov6650_g_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) {struct i2c_client *client =v4l2_get_subdevdata (sd);struct ov6650 *priv =to_ov6650 (client); -struct v4l2_captureparm *cp = &parms->parm.capture; -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -memset (cp,0 ,sizeof (*cp)); - cp->capability =V4L2_CAP_TIMEPERFRAME ;
drivers/media/i2c/ov6650.c static int ov6650_enum_mbus_code(struct v4l2_subdev *sd, · line 738
Quoted 10 lines
drivers/media/i2c/ov6650.c +4
-3- cp->timeperframe.numerator =GET_CLKRC_DIV (to_clkrc (&priv->tpf, +memset (ival->reserved,0 ,sizeof (ival->reserved)); + ival->interval.numerator =GET_CLKRC_DIV (to_clkrc (&priv->tpf, priv->pclk_limit, priv->pclk_max)); - cp->timeperframe.denominator =FRAME_RATE_MAX ; + ival->interval.denominator =FRAME_RATE_MAX ;dev_dbg (&client->dev,"Frame interval: %u/%u s\n" , - cp->timeperframe.numerator, cp->timeperframe.denominator); + ival->interval.numerator, ival->interval.denominator);
Hmm... not sure if a debug is needed here. Yet, if this is needed, IMHO, it would make mroe sense to move it to the core.
Thanks,
Mauro
Re: [PATCHv2 2/9] media: convert g/s_parm to g/s_frame_interval in subdevs
Quoted 34 lines · Mauro Carvalho Chehab
Em Mon, 22 Jan 2018 13:31:18 +0100
Hans Verkuil <[email protected]> escreveu:Quoted 31 lines
From: Hans Verkuil <[email protected]>
Convert all g/s_parm calls to g/s_frame_interval. This allows us to remove the g/s_parm ops since those are a duplicate of g/s_frame_interval.
Signed-off-by Hans Verkuil <[email protected]>--- drivers/media/i2c/mt9v011.c | 31 +++++++------------- drivers/media/i2c/ov6650.c | 35 +++++++++------------- drivers/media/i2c/ov7670.c | 24 +++++++-------- drivers/media/i2c/ov7740.c | 31 +++++++------------- drivers/media/i2c/tvp514x.c | 39 +++++++++---------------- drivers/media/i2c/vs6624.c | 29 +++++++----------- drivers/media/platform/atmel/atmel-isc.c | 10 ++----- drivers/media/platform/atmel/atmel-isi.c | 12 ++------ drivers/media/platform/blackfin/bfin_capture.c | 14 +++------ drivers/media/platform/marvell-ccic/mcam-core.c | 12 ++++---- drivers/media/platform/soc_camera/soc_camera.c | 10 ++++--- drivers/media/platform/via-camera.c | 4 +-- drivers/media/usb/em28xx/em28xx-video.c | 36 +++++++++++++++++++---- 13 files changed, 122 insertions(+), 165 deletions(-)drivers/media/i2c/mt9v011.c +0
-0@@ -364,33 +364,24 @@ static int mt9v011_set_fmt(struct v4l2_subdev *sd,return 0 ; }
Quoted 15 lines
drivers/media/i2c/mt9v011.c static int mt9v011_set_fmt(struct v4l2_subdev *sd, · line 370
Quoted 12 lines
drivers/media/i2c/mt9v011.c +3
-8-static int mt9v011_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int mt9v011_g_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) { -struct v4l2_captureparm *cp = &parms->parm.capture; - -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -memset (cp,0 ,sizeof (struct v4l2_captureparm )); - cp->capability =V4L2_CAP_TIMEPERFRAME ; +memset (ival->reserved,0 ,sizeof (ival->reserved));Hmm.. why to repeat memset everywhere? If the hole idea is to stop abusing, the best would be to do, instead:
g_frame_interval is called by bridge drivers through the subdev ops. So that path doesn't go through subdev_do_ioctl(). So it doesn't help putting it in v4l2-subdev.c.
That doesn't mean it shouldn't be there as well. I believe my MC patch series actually adds the memset in subdev_do_ioctl.
Quoted 43 lines
drivers/media/v4l2-core/v4l2-subdev.c +1
-0@@ -350,6 +350,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)if (fi->pad >= sd->entity.num_pads)return -EINVAL ; +memset (fi->reserved,0 ,sizeof (ival->reserved));return v4l2_subdev_call (sd, video, g_frame_interval, arg); }(same applies to
s_frame_interval).Quoted 13 lines
drivers/media/i2c/mt9v011.c +4
-3calc_fps (sd, - &cp->timeperframe.numerator, - &cp->timeperframe.denominator); + &ival->interval.numerator, + &ival->interval.denominator);return 0 ; } -static int mt9v011_s_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int mt9v011_s_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) {drivers/media/i2c/mt9v011.c static int mt9v011_set_fmt(struct v4l2_subdev *sd, · line 393
Quoted 10 lines
drivers/media/i2c/mt9v011.c +1
-7-struct v4l2_captureparm *cp = &parms->parm.capture; -struct v4l2_fract *tpf = &cp->timeperframe; +struct v4l2_fract *tpf = &ival->interval;u16 speed; -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; -if (cp->extendedmode !=0 ) -return -EINVAL ; -Hmm... why are you removing those sanity checks everywhere? The core doesn't do it.
Quoted 2 lines
All the above comments also apply to the other files modified by this patch.
struct v4l2_subdev_frame_interval has neither type nor extendedmode.
The check for type is done in the v4l2_g/s_parm_cap helpers instead. And extendedmode is always set to 0.
Quoted 53 lines
Quoted 53 lines
drivers/media/i2c/mt9v011.c +3
-2+memset (ival->reserved,0 ,sizeof (ival->reserved)); speed =calc_speed (sd, tpf->numerator, tpf->denominator);mt9v011_write (sd,R0A_MT9V011_CLK_SPEED , speed);@@ -469,8 +460,8 @@ static const struct v4l2_subdev_core_ops mt9v011_core_ops = { };static const struct v4l2_subdev_video_ops mt9v011_video_ops = { - .g_parm = mt9v011_g_parm, - .s_parm = mt9v011_s_parm, + .g_frame_interval = mt9v011_g_frame_interval, + .s_frame_interval = mt9v011_s_frame_interval, };static const struct v4l2_subdev_pad_ops mt9v011_pad_ops = {drivers/media/i2c/ov6650.c +6
-10@@ -201,7 +201,7 @@ struct ov6650 {struct v4l2_rect rect;/* sensor cropping window */ unsigned long pclk_limit;/* from host */ unsigned long pclk_max;/* from resolution and format */ -struct v4l2_fract tpf;/* as requested with s_parm */ +struct v4l2_fract tpf;/* as requested with s_frame_interval */ u32 code;enum v4l2_colorspace colorspace; };@@ -723,42 +723,33 @@ static int ov6650_enum_mbus_code(struct v4l2_subdev *sd,return 0 ; } -static int ov6650_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int ov6650_g_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) {struct i2c_client *client =v4l2_get_subdevdata (sd);struct ov6650 *priv =to_ov6650 (client); -struct v4l2_captureparm *cp = &parms->parm.capture; -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -memset (cp,0 ,sizeof (*cp)); - cp->capability =V4L2_CAP_TIMEPERFRAME ; - cp->timeperframe.numerator =GET_CLKRC_DIV (to_clkrc (&priv->tpf, +memset (ival->reserved,0 ,sizeof (ival->reserved)); + ival->interval.numerator =GET_CLKRC_DIV (to_clkrc (&priv->tpf, priv->pclk_limit, priv->pclk_max)); - cp->timeperframe.denominator =FRAME_RATE_MAX ; + ival->interval.denominator =FRAME_RATE_MAX ;
Quoted 6 lines
drivers/media/i2c/ov6650.c static int ov6650_enum_mbus_code(struct v4l2_subdev *sd, · line 738
Quoted 3 lines
drivers/media/i2c/ov6650.c +1
-1dev_dbg (&client->dev,"Frame interval: %u/%u s\n" , - cp->timeperframe.numerator, cp->timeperframe.denominator); + ival->interval.numerator, ival->interval.denominator);Hmm... not sure if a debug is needed here. Yet, if this is needed, IMHO, it would make mroe sense to move it to the core.
The core doesn't see this if this subdev op is called from a bridge driver.
Regards,
Hans
Re: [PATCHv2 2/9] media: convert g/s_parm to g/s_frame_interval in subdevs
Em Wed, 14 Feb 2018 17:34:17 +0100
Hans Verkuil <[email protected]> escreveu:
Quoted 51 lines · Mauro Carvalho Chehab
Quoted 34 lines
Em Mon, 22 Jan 2018 13:31:18 +0100
Hans Verkuil <[email protected]> escreveu:Quoted 31 lines
From: Hans Verkuil <[email protected]>
Convert all g/s_parm calls to g/s_frame_interval. This allows us to remove the g/s_parm ops since those are a duplicate of g/s_frame_interval.
Signed-off-by Hans Verkuil <[email protected]>--- drivers/media/i2c/mt9v011.c | 31 +++++++------------- drivers/media/i2c/ov6650.c | 35 +++++++++------------- drivers/media/i2c/ov7670.c | 24 +++++++-------- drivers/media/i2c/ov7740.c | 31 +++++++------------- drivers/media/i2c/tvp514x.c | 39 +++++++++---------------- drivers/media/i2c/vs6624.c | 29 +++++++----------- drivers/media/platform/atmel/atmel-isc.c | 10 ++----- drivers/media/platform/atmel/atmel-isi.c | 12 ++------ drivers/media/platform/blackfin/bfin_capture.c | 14 +++------ drivers/media/platform/marvell-ccic/mcam-core.c | 12 ++++---- drivers/media/platform/soc_camera/soc_camera.c | 10 ++++--- drivers/media/platform/via-camera.c | 4 +-- drivers/media/usb/em28xx/em28xx-video.c | 36 +++++++++++++++++++---- 13 files changed, 122 insertions(+), 165 deletions(-)drivers/media/i2c/mt9v011.c +0
-0@@ -364,33 +364,24 @@ static int mt9v011_set_fmt(struct v4l2_subdev *sd,return 0 ; }Quoted 15 lines
drivers/media/i2c/mt9v011.c static int mt9v011_set_fmt(struct v4l2_subdev *sd, · line 370
Quoted 12 lines
drivers/media/i2c/mt9v011.c +3
-8-static int mt9v011_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int mt9v011_g_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) { -struct v4l2_captureparm *cp = &parms->parm.capture; - -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -memset (cp,0 ,sizeof (struct v4l2_captureparm )); - cp->capability =V4L2_CAP_TIMEPERFRAME ; +memset (ival->reserved,0 ,sizeof (ival->reserved));Hmm.. why to repeat memset everywhere? If the hole idea is to stop abusing, the best would be to do, instead:
Quoted 3 lines
g_frame_intervalis called by bridge drivers through the subdev ops. So that path doesn't go throughsubdev_do_ioctl(). So it doesn't help putting it inv4l2-subdev.c.
True, but you could also do the same for v4l2 ioctl() handling logic.
That would mean just two places with memset() instead of repeating the same pattern everywhere.
Quoted 46 lines
That doesn't mean it shouldn't be there as well. I believe my MC patch series actually adds the memset in
subdev_do_ioctl.Quoted 43 lines
drivers/media/v4l2-core/v4l2-subdev.c +1
-0@@ -350,6 +350,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)if (fi->pad >= sd->entity.num_pads)return -EINVAL ; +memset (fi->reserved,0 ,sizeof (ival->reserved));return v4l2_subdev_call (sd, video, g_frame_interval, arg); }(same applies to
s_frame_interval).Quoted 13 lines
drivers/media/i2c/mt9v011.c +4
-3calc_fps (sd, - &cp->timeperframe.numerator, - &cp->timeperframe.denominator); + &ival->interval.numerator, + &ival->interval.denominator);return 0 ; } -static int mt9v011_s_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int mt9v011_s_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) {drivers/media/i2c/mt9v011.c static int mt9v011_set_fmt(struct v4l2_subdev *sd, · line 393
Quoted 10 lines
drivers/media/i2c/mt9v011.c +1
-7-struct v4l2_captureparm *cp = &parms->parm.capture; -struct v4l2_fract *tpf = &cp->timeperframe; +struct v4l2_fract *tpf = &ival->interval;u16 speed; -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; -if (cp->extendedmode !=0 ) -return -EINVAL ; -Hmm... why are you removing those sanity checks everywhere? The core doesn't do it.
Quoted 6 lines
Quoted 2 lines
All the above comments also apply to the other files modified by this patch.
struct
v4l2_subdev_frame_intervalhas neither type nor extendedmode.The check for type is done in the v4l2_g/s_parm_cap helpers instead.
Well, the subdev handler at v4l2-subdev.c doesn't seem to be checking it.
Quoted 55 lines
And extendedmode is always set to 0.
Quoted 53 lines
Quoted 53 lines
drivers/media/i2c/mt9v011.c +3
-2+memset (ival->reserved,0 ,sizeof (ival->reserved)); speed =calc_speed (sd, tpf->numerator, tpf->denominator);mt9v011_write (sd,R0A_MT9V011_CLK_SPEED , speed);@@ -469,8 +460,8 @@ static const struct v4l2_subdev_core_ops mt9v011_core_ops = { };static const struct v4l2_subdev_video_ops mt9v011_video_ops = { - .g_parm = mt9v011_g_parm, - .s_parm = mt9v011_s_parm, + .g_frame_interval = mt9v011_g_frame_interval, + .s_frame_interval = mt9v011_s_frame_interval, };static const struct v4l2_subdev_pad_ops mt9v011_pad_ops = {drivers/media/i2c/ov6650.c +6
-10@@ -201,7 +201,7 @@ struct ov6650 {struct v4l2_rect rect;/* sensor cropping window */ unsigned long pclk_limit;/* from host */ unsigned long pclk_max;/* from resolution and format */ -struct v4l2_fract tpf;/* as requested with s_parm */ +struct v4l2_fract tpf;/* as requested with s_frame_interval */ u32 code;enum v4l2_colorspace colorspace; };@@ -723,42 +723,33 @@ static int ov6650_enum_mbus_code(struct v4l2_subdev *sd,return 0 ; } -static int ov6650_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int ov6650_g_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) {struct i2c_client *client =v4l2_get_subdevdata (sd);struct ov6650 *priv =to_ov6650 (client); -struct v4l2_captureparm *cp = &parms->parm.capture; -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -memset (cp,0 ,sizeof (*cp)); - cp->capability =V4L2_CAP_TIMEPERFRAME ; - cp->timeperframe.numerator =GET_CLKRC_DIV (to_clkrc (&priv->tpf, +memset (ival->reserved,0 ,sizeof (ival->reserved)); + ival->interval.numerator =GET_CLKRC_DIV (to_clkrc (&priv->tpf, priv->pclk_limit, priv->pclk_max)); - cp->timeperframe.denominator =FRAME_RATE_MAX ; + ival->interval.denominator =FRAME_RATE_MAX ;
Quoted 8 lines
Quoted 6 lines
drivers/media/i2c/ov6650.c static int ov6650_enum_mbus_code(struct v4l2_subdev *sd, · line 738
Quoted 3 lines
drivers/media/i2c/ov6650.c +1
-1dev_dbg (&client->dev,"Frame interval: %u/%u s\n" , - cp->timeperframe.numerator, cp->timeperframe.denominator); + ival->interval.numerator, ival->interval.denominator);Hmm... not sure if a debug is needed here. Yet, if this is needed, IMHO, it would make mroe sense to move it to the core.
The core doesn't see this if this subdev op is called from a bridge driver.
True, but, when calling via a bridge driver, there's already a way to enable such kind debug.
Thanks,
Mauro
Re: [PATCHv2 2/9] media: convert g/s_parm to g/s_frame_interval in subdevs
Quoted 54 lines · Mauro Carvalho Chehab
Em Wed, 14 Feb 2018 17:34:17 +0100
Hans Verkuil <[email protected]> escreveu:Quoted 51 lines · Mauro Carvalho Chehab
Quoted 49 lines
Em Mon, 22 Jan 2018 13:31:18 +0100
Hans Verkuil <[email protected]> escreveu:Quoted 33 lines
From: Hans Verkuil <[email protected]>
Convert all g/s_parm calls to g/s_frame_interval. This allows us to remove the g/s_parm ops since those are a duplicate of g/s_frame_interval.
Signed-off-by Hans Verkuil <[email protected]>--- drivers/media/i2c/mt9v011.c | 31 +++++++------------- drivers/media/i2c/ov6650.c | 35 +++++++++------------- drivers/media/i2c/ov7670.c | 24 +++++++-------- drivers/media/i2c/ov7740.c | 31 +++++++------------- drivers/media/i2c/tvp514x.c | 39 +++++++++---------------- drivers/media/i2c/vs6624.c | 29 +++++++----------- drivers/media/platform/atmel/atmel-isc.c | 10 ++----- drivers/media/platform/atmel/atmel-isi.c | 12 ++------ drivers/media/platform/blackfin/bfin_capture.c | 14 +++------ drivers/media/platform/marvell-ccic/mcam-core.c | 12 ++++---- drivers/media/platform/soc_camera/soc_camera.c | 10 ++++--- drivers/media/platform/via-camera.c | 4 +-- drivers/media/usb/em28xx/em28xx-video.c | 36 +++++++++++++++++++---- 13 files changed, 122 insertions(+), 165 deletions(-)drivers/media/i2c/mt9v011.c +1
-1@@ -364,33 +364,24 @@ static int mt9v011_set_fmt(struct v4l2_subdev *sd,return 0 ; } -static int mt9v011_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int mt9v011_g_frame_interval(struct v4l2_subdev *sd,drivers/media/i2c/mt9v011.c static int mt9v011_set_fmt(struct v4l2_subdev *sd, · line 370
Quoted 10 lines
drivers/media/i2c/mt9v011.c +2
-7+ struct v4l2_subdev_frame_interval *ival) { -struct v4l2_captureparm *cp = &parms->parm.capture; - -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -memset (cp,0 ,sizeof (struct v4l2_captureparm )); - cp->capability =V4L2_CAP_TIMEPERFRAME ; +memset (ival->reserved,0 ,sizeof (ival->reserved));Hmm.. why to repeat memset everywhere? If the hole idea is to stop abusing, the best would be to do, instead:
Quoted 11 lines
Quoted 3 lines
g_frame_intervalis called by bridge drivers through the subdev ops. So that path doesn't go throughsubdev_do_ioctl(). So it doesn't help putting it inv4l2-subdev.c.True, but you could also do the same for v4l2
ioctl()handling logic.That would mean just two places with
memset()instead of repeating the same pattern everywhere.Quoted 2 lines
That doesn't mean it shouldn't be there as well. I believe my MC patch series actually adds the memset in
subdev_do_ioctl.
What could be done is that this patch https://patchwork.linuxtv.org/patch/46955/
is applied first. After that these memsets can be removed since internally we don't need to touch them.
Quoted 44 lines
Quoted 44 lines
Quoted 44 lines
drivers/media/v4l2-core/v4l2-subdev.c +1
-0@@ -350,6 +350,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)if (fi->pad >= sd->entity.num_pads)return -EINVAL ; +memset (fi->reserved,0 ,sizeof (ival->reserved));return v4l2_subdev_call (sd, video, g_frame_interval, arg); }(same applies to
s_frame_interval).Quoted 13 lines
drivers/media/i2c/mt9v011.c +4
-3calc_fps (sd, - &cp->timeperframe.numerator, - &cp->timeperframe.denominator); + &ival->interval.numerator, + &ival->interval.denominator);return 0 ; } -static int mt9v011_s_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int mt9v011_s_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) {drivers/media/i2c/mt9v011.c static int mt9v011_set_fmt(struct v4l2_subdev *sd, · line 393
Quoted 10 lines
drivers/media/i2c/mt9v011.c +1
-7-struct v4l2_captureparm *cp = &parms->parm.capture; -struct v4l2_fract *tpf = &cp->timeperframe; +struct v4l2_fract *tpf = &ival->interval;u16 speed; -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; -if (cp->extendedmode !=0 ) -return -EINVAL ; -Hmm... why are you removing those sanity checks everywhere? The core doesn't do it.
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
All the above comments also apply to the other files modified by this patch.
struct
v4l2_subdev_frame_intervalhas neither type nor extendedmode.The check for type is done in the v4l2_g/s_parm_cap helpers instead.
Well, the subdev handler at
v4l2-subdev.cdoesn't seem to be checking it.
????
Are you confusing struct v4l2_streamparm with struct v4l2_subdev_frame_interval?
v4l2_subdev.c deals with the latter, and struct v4l2_subdev_frame_interval has no type field. There is nothing to check.
'type' makes no sense in subdev drivers anyway since it refers to a buffer type and subdevs do not deal with buffers.
Quoted 64 lines
Quoted 64 lines
And extendedmode is always set to 0.
Quoted 59 lines
Quoted 46 lines
drivers/media/i2c/mt9v011.c +3
-2+memset (ival->reserved,0 ,sizeof (ival->reserved)); speed =calc_speed (sd, tpf->numerator, tpf->denominator);mt9v011_write (sd,R0A_MT9V011_CLK_SPEED , speed);@@ -469,8 +460,8 @@ static const struct v4l2_subdev_core_ops mt9v011_core_ops = { };static const struct v4l2_subdev_video_ops mt9v011_video_ops = { - .g_parm = mt9v011_g_parm, - .s_parm = mt9v011_s_parm, + .g_frame_interval = mt9v011_g_frame_interval, + .s_frame_interval = mt9v011_s_frame_interval, };static const struct v4l2_subdev_pad_ops mt9v011_pad_ops = {drivers/media/i2c/ov6650.c +3
-8@@ -201,7 +201,7 @@ struct ov6650 {struct v4l2_rect rect;/* sensor cropping window */ unsigned long pclk_limit;/* from host */ unsigned long pclk_max;/* from resolution and format */ -struct v4l2_fract tpf;/* as requested with s_parm */ +struct v4l2_fract tpf;/* as requested with s_frame_interval */ u32 code;enum v4l2_colorspace colorspace; };@@ -723,42 +723,33 @@ static int ov6650_enum_mbus_code(struct v4l2_subdev *sd,return 0 ; } -static int ov6650_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int ov6650_g_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) {struct i2c_client *client =v4l2_get_subdevdata (sd);struct ov6650 *priv =to_ov6650 (client); -struct v4l2_captureparm *cp = &parms->parm.capture; -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -memset (cp,0 ,sizeof (*cp)); - cp->capability =V4L2_CAP_TIMEPERFRAME ;drivers/media/i2c/ov6650.c static int ov6650_enum_mbus_code(struct v4l2_subdev *sd, · line 738
Quoted 10 lines
drivers/media/i2c/ov6650.c +4
-3- cp->timeperframe.numerator =GET_CLKRC_DIV (to_clkrc (&priv->tpf, +memset (ival->reserved,0 ,sizeof (ival->reserved)); + ival->interval.numerator =GET_CLKRC_DIV (to_clkrc (&priv->tpf, priv->pclk_limit, priv->pclk_max)); - cp->timeperframe.denominator =FRAME_RATE_MAX ; + ival->interval.denominator =FRAME_RATE_MAX ;dev_dbg (&client->dev,"Frame interval: %u/%u s\n" , - cp->timeperframe.numerator, cp->timeperframe.denominator); + ival->interval.numerator, ival->interval.denominator);Hmm... not sure if a debug is needed here. Yet, if this is needed, IMHO, it would make mroe sense to move it to the core.
Quoted 4 lines
Quoted 1 line
The core doesn't see this if this subdev op is called from a bridge driver.
True, but, when calling via a bridge driver, there's already a way to enable such kind debug.
It can debug VIDIOC_G/S_PARM, not the g_frame_interval op. Also, when called via a v4l-subdev device node there is currently NO core logging.
For the record, I don't really care about this debug statement myself one way or another, but changing this one way or another doesn't belong in this patch series.
Regards,
Hans
Re: [PATCHv2 2/9] media: convert g/s_parm to g/s_frame_interval in subdevs
Em Wed, 14 Feb 2018 18:16:55 +0100
Hans Verkuil <[email protected]> escreveu:
Quoted 64 lines · Mauro Carvalho Chehab
Quoted 63 lines
Em Wed, 14 Feb 2018 17:34:17 +0100
Hans Verkuil <[email protected]> escreveu:Quoted 51 lines · Mauro Carvalho Chehab
Quoted 34 lines
Em Mon, 22 Jan 2018 13:31:18 +0100
Hans Verkuil <[email protected]> escreveu:Quoted 31 lines
From: Hans Verkuil <[email protected]>
Convert all g/s_parm calls to g/s_frame_interval. This allows us to remove the g/s_parm ops since those are a duplicate of g/s_frame_interval.
Signed-off-by Hans Verkuil <[email protected]>--- drivers/media/i2c/mt9v011.c | 31 +++++++------------- drivers/media/i2c/ov6650.c | 35 +++++++++------------- drivers/media/i2c/ov7670.c | 24 +++++++-------- drivers/media/i2c/ov7740.c | 31 +++++++------------- drivers/media/i2c/tvp514x.c | 39 +++++++++---------------- drivers/media/i2c/vs6624.c | 29 +++++++----------- drivers/media/platform/atmel/atmel-isc.c | 10 ++----- drivers/media/platform/atmel/atmel-isi.c | 12 ++------ drivers/media/platform/blackfin/bfin_capture.c | 14 +++------ drivers/media/platform/marvell-ccic/mcam-core.c | 12 ++++---- drivers/media/platform/soc_camera/soc_camera.c | 10 ++++--- drivers/media/platform/via-camera.c | 4 +-- drivers/media/usb/em28xx/em28xx-video.c | 36 +++++++++++++++++++---- 13 files changed, 122 insertions(+), 165 deletions(-)drivers/media/i2c/mt9v011.c +0
-0@@ -364,33 +364,24 @@ static int mt9v011_set_fmt(struct v4l2_subdev *sd,return 0 ; }Quoted 15 lines
drivers/media/i2c/mt9v011.c static int mt9v011_set_fmt(struct v4l2_subdev *sd, · line 370
Quoted 12 lines
drivers/media/i2c/mt9v011.c +3
-8-static int mt9v011_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int mt9v011_g_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) { -struct v4l2_captureparm *cp = &parms->parm.capture; - -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -memset (cp,0 ,sizeof (struct v4l2_captureparm )); - cp->capability =V4L2_CAP_TIMEPERFRAME ; +memset (ival->reserved,0 ,sizeof (ival->reserved));Hmm.. why to repeat memset everywhere? If the hole idea is to stop abusing, the best would be to do, instead:
Quoted 3 lines
g_frame_intervalis called by bridge drivers through the subdev ops. So that path doesn't go throughsubdev_do_ioctl(). So it doesn't help putting it inv4l2-subdev.c.True, but you could also do the same for v4l2
ioctl()handling logic.That would mean just two places with
memset()instead of repeating the same pattern everywhere.
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
That doesn't mean it shouldn't be there as well. I believe my MC patch series actually adds the memset in
subdev_do_ioctl.What could be done is that this patch https://patchwork.linuxtv.org/patch/46955/
is applied first. After that these memsets can be removed since internally we don't need to touch them.
Works for me.
Quoted 55 lines
Quoted 44 lines
Quoted 44 lines
Quoted 44 lines
drivers/media/v4l2-core/v4l2-subdev.c +1
-0@@ -350,6 +350,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)if (fi->pad >= sd->entity.num_pads)return -EINVAL ; +memset (fi->reserved,0 ,sizeof (ival->reserved));return v4l2_subdev_call (sd, video, g_frame_interval, arg); }(same applies to
s_frame_interval).Quoted 13 lines
drivers/media/i2c/mt9v011.c +4
-3calc_fps (sd, - &cp->timeperframe.numerator, - &cp->timeperframe.denominator); + &ival->interval.numerator, + &ival->interval.denominator);return 0 ; } -static int mt9v011_s_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int mt9v011_s_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) {drivers/media/i2c/mt9v011.c static int mt9v011_set_fmt(struct v4l2_subdev *sd, · line 393
Quoted 10 lines
drivers/media/i2c/mt9v011.c +1
-7-struct v4l2_captureparm *cp = &parms->parm.capture; -struct v4l2_fract *tpf = &cp->timeperframe; +struct v4l2_fract *tpf = &ival->interval;u16 speed; -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; -if (cp->extendedmode !=0 ) -return -EINVAL ; -Hmm... why are you removing those sanity checks everywhere? The core doesn't do it.
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
All the above comments also apply to the other files modified by this patch.
struct
v4l2_subdev_frame_intervalhas neither type nor extendedmode.The check for type is done in the v4l2_g/s_parm_cap helpers instead.
Well, the subdev handler at
v4l2-subdev.cdoesn't seem to be checking it.????
Quoted 7 lines
Are you confusing struct
v4l2_streamparmwith structv4l2_subdev_frame_interval?
v4l2_subdev.cdeals with the latter, and structv4l2_subdev_frame_intervalhas no type field. There is nothing to check.'type' makes no sense in subdev drivers anyway since it refers to a buffer type and subdevs do not deal with buffers.
Yeah, you're right: those checks can be removed.
Quoted 67 lines
Quoted 62 lines
Quoted 62 lines
And extendedmode is always set to 0.
Quoted 59 lines
Quoted 46 lines
drivers/media/i2c/mt9v011.c +3
-2+memset (ival->reserved,0 ,sizeof (ival->reserved)); speed =calc_speed (sd, tpf->numerator, tpf->denominator);mt9v011_write (sd,R0A_MT9V011_CLK_SPEED , speed);@@ -469,8 +460,8 @@ static const struct v4l2_subdev_core_ops mt9v011_core_ops = { };static const struct v4l2_subdev_video_ops mt9v011_video_ops = { - .g_parm = mt9v011_g_parm, - .s_parm = mt9v011_s_parm, + .g_frame_interval = mt9v011_g_frame_interval, + .s_frame_interval = mt9v011_s_frame_interval, };static const struct v4l2_subdev_pad_ops mt9v011_pad_ops = {drivers/media/i2c/ov6650.c +3
-8@@ -201,7 +201,7 @@ struct ov6650 {struct v4l2_rect rect;/* sensor cropping window */ unsigned long pclk_limit;/* from host */ unsigned long pclk_max;/* from resolution and format */ -struct v4l2_fract tpf;/* as requested with s_parm */ +struct v4l2_fract tpf;/* as requested with s_frame_interval */ u32 code;enum v4l2_colorspace colorspace; };@@ -723,42 +723,33 @@ static int ov6650_enum_mbus_code(struct v4l2_subdev *sd,return 0 ; } -static int ov6650_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *parms) +static int ov6650_g_frame_interval (struct v4l2_subdev *sd, +struct v4l2_subdev_frame_interval *ival) {struct i2c_client *client =v4l2_get_subdevdata (sd);struct ov6650 *priv =to_ov6650 (client); -struct v4l2_captureparm *cp = &parms->parm.capture; -if (parms->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -memset (cp,0 ,sizeof (*cp)); - cp->capability =V4L2_CAP_TIMEPERFRAME ;drivers/media/i2c/ov6650.c static int ov6650_enum_mbus_code(struct v4l2_subdev *sd, · line 738
Quoted 10 lines
drivers/media/i2c/ov6650.c +4
-3- cp->timeperframe.numerator =GET_CLKRC_DIV (to_clkrc (&priv->tpf, +memset (ival->reserved,0 ,sizeof (ival->reserved)); + ival->interval.numerator =GET_CLKRC_DIV (to_clkrc (&priv->tpf, priv->pclk_limit, priv->pclk_max)); - cp->timeperframe.denominator =FRAME_RATE_MAX ; + ival->interval.denominator =FRAME_RATE_MAX ;dev_dbg (&client->dev,"Frame interval: %u/%u s\n" , - cp->timeperframe.numerator, cp->timeperframe.denominator); + ival->interval.numerator, ival->interval.denominator);Hmm... not sure if a debug is needed here. Yet, if this is needed, IMHO, it would make mroe sense to move it to the core.
Quoted 4 lines
Quoted 1 line
The core doesn't see this if this subdev op is called from a bridge driver.
True, but, when calling via a bridge driver, there's already a way to enable such kind debug.
Quoted 6 lines
It can debug VIDIOC_G/S_PARM, not the
g_frame_intervalop. Also, when called via a v4l-subdev device node there is currently NO core logging.For the record, I don't really care about this debug statement myself one way or another, but changing this one way or another doesn't belong in this patch series.
Ok. Yet, IMHO, it is probably safe to just remove the debug statements on the above driver, as I fail to see that just ov6650 driver would need this.
Quoted 4 lines
Regards,
Hans
Thanks,
Mauro
PATCH v2 3/9 staging: atomisp: Kill subdev s_parm abuse
In reply to Hans VerkuilFrom: Sakari Ailus <[email protected]>
Remove sensor driver's interface that made use of use case specific knowledge of platform capabilities.
--- drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 26 --------- drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 26 --------- drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 29 --------- drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 26 --------- drivers/staging/media/atomisp/i2c/gc0310.h | 43 -------------- drivers/staging/media/atomisp/i2c/gc2235.h | 1 - drivers/staging/media/atomisp/i2c/ov2680.h | 68 ---------------------- .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 27 --------- .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 9 +-- .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 12 +--- 10 files changed, 3 insertions(+), 264 deletions(-)
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c +0 -26
@@ -1224,37 +1224,12 @@ static int gc0310_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = gc0310_res[dev->fmt_idx].fps; }return 0 ; } -static int gc0310_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct gc0310_device *dev =to_gc0310_sensor (sd); - dev->run_mode = param->parm.capture.capturemode; - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - gc0310_res = gc0310_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - gc0310_res = gc0310_res_still; -N_RES =N_RES_STILL ; -break ; -default : - gc0310_res = gc0310_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int gc0310_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {
@@ -1314,7 +1289,6 @@ static const struct v4l2_subdev_sensor_ops gc0310_sensor_ops = {static const struct v4l2_subdev_video_ops gc0310_video_ops = { .s_stream = gc0310_s_stream, .g_parm = gc0310_g_parm, - .s_parm = gc0310_s_parm, .g_frame_interval = gc0310_g_frame_interval, };
drivers/staging/media/atomisp/i2c/atomisp-gc2235.c +0 -26
@@ -964,37 +964,12 @@ static int gc2235_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = gc2235_res[dev->fmt_idx].fps; }return 0 ; } -static int gc2235_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct gc2235_device *dev =to_gc2235_sensor (sd); - dev->run_mode = param->parm.capture.capturemode; - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - gc2235_res = gc2235_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - gc2235_res = gc2235_res_still; -N_RES =N_RES_STILL ; -break ; -default : - gc2235_res = gc2235_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int gc2235_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {
@@ -1053,7 +1028,6 @@ static const struct v4l2_subdev_sensor_ops gc2235_sensor_ops = {static const struct v4l2_subdev_video_ops gc2235_video_ops = { .s_stream = gc2235_s_stream, .g_parm = gc2235_g_parm, - .s_parm = gc2235_s_parm, .g_frame_interval = gc2235_g_frame_interval, };
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +0 -29
@@ -1300,40 +1300,12 @@ static int ov2680_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = ov2680_res[dev->fmt_idx].fps; }return 0 ; } -static int ov2680_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct ov2680_device *dev =to_ov2680_sensor (sd); -struct i2c_client *client =v4l2_get_subdevdata (sd); - dev->run_mode = param->parm.capture.capturemode; - -v4l2_info (client,"\n%s:run_mode :%x\n" , __func__, dev->run_mode); - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - ov2680_res = ov2680_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - ov2680_res = ov2680_res_still; -N_RES =N_RES_STILL ; -break ; -default : - ov2680_res = ov2680_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int ov2680_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {
@@ -1388,7 +1360,6 @@ static int ov2680_g_skip_frames(struct v4l2_subdev *sd, u32 *frames)static const struct v4l2_subdev_video_ops ov2680_video_ops = { .s_stream = ov2680_s_stream, .g_parm = ov2680_g_parm, - .s_parm = ov2680_s_parm, .g_frame_interval = ov2680_g_frame_interval, };
drivers/staging/media/atomisp/i2c/atomisp-ov2722.c +0 -26
@@ -1103,37 +1103,12 @@ static int ov2722_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = ov2722_res[dev->fmt_idx].fps; }return 0 ; } -static int ov2722_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct ov2722_device *dev =to_ov2722_sensor (sd); - dev->run_mode = param->parm.capture.capturemode; - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - ov2722_res = ov2722_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - ov2722_res = ov2722_res_still; -N_RES =N_RES_STILL ; -break ; -default : - ov2722_res = ov2722_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int ov2722_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {
@@ -1193,7 +1168,6 @@ static const struct v4l2_subdev_sensor_ops ov2722_sensor_ops = {static const struct v4l2_subdev_video_ops ov2722_video_ops = { .s_stream = ov2722_s_stream, .g_parm = ov2722_g_parm, - .s_parm = ov2722_s_parm, .g_frame_interval = ov2722_g_frame_interval, };
drivers/staging/media/atomisp/i2c/gc0310.h +0 -43
55 lines not on this page · raw message
drivers/staging/media/atomisp/i2c/gc2235.h +0 -1
@@ -156,7 +156,6 @@ struct gc2235_device {struct camera_sensor_platform_data *platform_data;int vt_pix_clk_freq_mhz;int fmt_idx; -int run_mode;u8 res;u8 type; };
drivers/staging/media/atomisp/i2c/ov2680.h +0 -68
74 lines not on this page · raw message
drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c +0 -27
@@ -1825,38 +1825,12 @@ static int ov5693_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = ov5693_res[dev->fmt_idx].fps; }return 0 ; } -static int ov5693_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct ov5693_device *dev =to_ov5693_sensor (sd); - - dev->run_mode = param->parm.capture.capturemode; - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - ov5693_res = ov5693_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - ov5693_res = ov5693_res_still; -N_RES =N_RES_STILL ; -break ; -default : - ov5693_res = ov5693_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int ov5693_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {
@@ -1900,7 +1874,6 @@ static int ov5693_enum_frame_size(struct v4l2_subdev *sd,static const struct v4l2_subdev_video_ops ov5693_video_ops = { .s_stream = ov5693_s_stream, .g_parm = ov5693_g_parm, - .s_parm = ov5693_s_parm, .g_frame_interval = ov5693_g_frame_interval, };
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c +2 -7
@@ -2091,7 +2091,7 @@ int atomisp_set_sensor_runmode(struct atomisp_sub_device *asd,struct atomisp_device *isp = asd->isp;struct v4l2_ctrl *c;struct v4l2_streamparm p = {0 }; -int ret; +int ret =0 ;int modes[] = {CI_MODE_NONE ,CI_MODE_VIDEO ,CI_MODE_STILL_CAPTURE ,
@@ -2105,13 +2105,8 @@ int atomisp_set_sensor_runmode(struct atomisp_sub_device *asd, c =v4l2_ctrl_find (isp->inputs[asd->input_curr].camera->ctrl_handler,V4L2_CID_RUN_MODE ); -if (c) { +if (c) ret =v4l2_ctrl_s_ctrl (c, runmode->mode); - }else { - p.parm.capture.capturemode = modes[runmode->mode]; - ret =v4l2_subdev_call (isp->inputs[asd->input_curr].camera, - video, s_parm, &p); - }mutex_unlock (asd->ctrl_handler.lock);return ret;
drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c +1 -11
@@ -819,12 +819,6 @@ static int __atomisp_update_run_mode(struct atomisp_sub_device *asd)struct atomisp_device *isp = asd->isp;struct v4l2_ctrl *ctrl = asd->run_mode;struct v4l2_ctrl *c; -struct v4l2_streamparm p = {0 }; -int modes[] = {CI_MODE_NONE , -CI_MODE_VIDEO , -CI_MODE_STILL_CAPTURE , -CI_MODE_CONTINUOUS , -CI_MODE_PREVIEW };s32 mode; if (ctrl->val != ATOMISP_RUN_MODE_VIDEO &&
@@ -840,11 +834,7 @@ static int __atomisp_update_run_mode(struct atomisp_sub_device *asd)if (c)return v4l2_ctrl_s_ctrl (c, mode); -/* Fall back to obsolete s_parm */ - p.parm.capture.capturemode = modes[mode]; - -return v4l2_subdev_call ( - isp->inputs[asd->input_curr].camera, video, s_parm, &p); +return 0 ; }int atomisp_update_run_mode (struct atomisp_sub_device *asd)
Signature · 1 line
2.15.1
Re: [PATCHv2 3/9] staging: atomisp: Kill subdev s_parm abuse
Sakari,
Em Mon, 22 Jan 2018 13:31:19 +0100
Hans Verkuil <[email protected]> escreveu:
Quoted 4 lines
From: Sakari Ailus <[email protected]>
Remove sensor driver's interface that made use of use case specific knowledge of platform capabilities.
Could you better describe it? What s_param abuse?
What happens after this patch? It seems that atomISP relies on gc0310_res. So, I would be expecting that a patch removing s_param would be also adding/changing other parts of the code accordingly, in order to get rid of that as a hole (or initialize it somewhere else).
Regards,
Mauro
Quoted 470 lines
Signed-off-by Sakari Ailus <[email protected]>Signed-off-by Hans Verkuil <[email protected]>--- drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 26 --------- drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 26 --------- drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 29 --------- drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 26 --------- drivers/staging/media/atomisp/i2c/gc0310.h | 43 -------------- drivers/staging/media/atomisp/i2c/gc2235.h | 1 - drivers/staging/media/atomisp/i2c/ov2680.h | 68 ---------------------- .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 27 --------- .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 9 +-- .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 12 +--- 10 files changed, 3 insertions(+), 264 deletions(-)drivers/staging/media/atomisp/i2c/atomisp-gc0310.c +0
-26@@ -1224,37 +1224,12 @@ static int gc0310_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = gc0310_res[dev->fmt_idx].fps; }return 0 ; } -static int gc0310_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct gc0310_device *dev =to_gc0310_sensor (sd); - dev->run_mode = param->parm.capture.capturemode; - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - gc0310_res = gc0310_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - gc0310_res = gc0310_res_still; -N_RES =N_RES_STILL ; -break ; -default : - gc0310_res = gc0310_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int gc0310_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {@@ -1314,7 +1289,6 @@ static const struct v4l2_subdev_sensor_ops gc0310_sensor_ops = {static const struct v4l2_subdev_video_ops gc0310_video_ops = { .s_stream = gc0310_s_stream, .g_parm = gc0310_g_parm, - .s_parm = gc0310_s_parm, .g_frame_interval = gc0310_g_frame_interval, };drivers/staging/media/atomisp/i2c/atomisp-gc2235.c +0
-26@@ -964,37 +964,12 @@ static int gc2235_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = gc2235_res[dev->fmt_idx].fps; }return 0 ; } -static int gc2235_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct gc2235_device *dev =to_gc2235_sensor (sd); - dev->run_mode = param->parm.capture.capturemode; - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - gc2235_res = gc2235_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - gc2235_res = gc2235_res_still; -N_RES =N_RES_STILL ; -break ; -default : - gc2235_res = gc2235_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int gc2235_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {@@ -1053,7 +1028,6 @@ static const struct v4l2_subdev_sensor_ops gc2235_sensor_ops = {static const struct v4l2_subdev_video_ops gc2235_video_ops = { .s_stream = gc2235_s_stream, .g_parm = gc2235_g_parm, - .s_parm = gc2235_s_parm, .g_frame_interval = gc2235_g_frame_interval, };drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +0
-29@@ -1300,40 +1300,12 @@ static int ov2680_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = ov2680_res[dev->fmt_idx].fps; }return 0 ; } -static int ov2680_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct ov2680_device *dev =to_ov2680_sensor (sd); -struct i2c_client *client =v4l2_get_subdevdata (sd); - dev->run_mode = param->parm.capture.capturemode; - -v4l2_info (client,"\n%s:run_mode :%x\n" , __func__, dev->run_mode); - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - ov2680_res = ov2680_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - ov2680_res = ov2680_res_still; -N_RES =N_RES_STILL ; -break ; -default : - ov2680_res = ov2680_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int ov2680_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {@@ -1388,7 +1360,6 @@ static int ov2680_g_skip_frames(struct v4l2_subdev *sd, u32 *frames)static const struct v4l2_subdev_video_ops ov2680_video_ops = { .s_stream = ov2680_s_stream, .g_parm = ov2680_g_parm, - .s_parm = ov2680_s_parm, .g_frame_interval = ov2680_g_frame_interval, };drivers/staging/media/atomisp/i2c/atomisp-ov2722.c +0
-26@@ -1103,37 +1103,12 @@ static int ov2722_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = ov2722_res[dev->fmt_idx].fps; }return 0 ; } -static int ov2722_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct ov2722_device *dev =to_ov2722_sensor (sd); - dev->run_mode = param->parm.capture.capturemode; - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - ov2722_res = ov2722_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - ov2722_res = ov2722_res_still; -N_RES =N_RES_STILL ; -break ; -default : - ov2722_res = ov2722_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int ov2722_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {@@ -1193,7 +1168,6 @@ static const struct v4l2_subdev_sensor_ops ov2722_sensor_ops = {static const struct v4l2_subdev_video_ops ov2722_video_ops = { .s_stream = ov2722_s_stream, .g_parm = ov2722_g_parm, - .s_parm = ov2722_s_parm, .g_frame_interval = ov2722_g_frame_interval, };drivers/staging/media/atomisp/i2c/gc0310.h +0
-43@@ -150,7 +150,6 @@ struct gc0310_device {struct camera_sensor_platform_data *platform_data;int vt_pix_clk_freq_mhz;int fmt_idx; -int run_mode;u8 res;u8 type; };@@ -400,48 +399,6 @@ struct gc0310_resolution gc0310_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(gc0310_res_preview)) -struct gc0310_resolution gc0310_res_still[] = { - { - .desc ="gc0310_VGA_30fps" , - .width =656 ,// 648, - .height =496 ,// 488, - .fps =30 , -//.pix_clk_freq = 73, - .used =0 , -#if 0 - .pixels_per_line =0x0314 , - .lines_per_frame =0x0213 , -#endif - .bin_factor_x =1 , - .bin_factor_y =1 , - .bin_mode =0 , - .skip_frames =2 , - .regs = gc0310_VGA_30fps, - }, -}; -#define N_RES_STILL (ARRAY_SIZE(gc0310_res_still)) - -struct gc0310_resolution gc0310_res_video[] = { - { - .desc ="gc0310_VGA_30fps" , - .width =656 ,// 648, - .height =496 ,// 488, - .fps =30 , -//.pix_clk_freq = 73, - .used =0 , -#if 0 - .pixels_per_line =0x0314 , - .lines_per_frame =0x0213 , -#endif - .bin_factor_x =1 , - .bin_factor_y =1 , - .bin_mode =0 , - .skip_frames =2 , - .regs = gc0310_VGA_30fps, - }, -}; -#define N_RES_VIDEO (ARRAY_SIZE(gc0310_res_video)) -static struct gc0310_resolution *gc0310_res = gc0310_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;#endif drivers/staging/media/atomisp/i2c/gc2235.h +0
-1@@ -156,7 +156,6 @@ struct gc2235_device {struct camera_sensor_platform_data *platform_data;int vt_pix_clk_freq_mhz;int fmt_idx; -int run_mode;u8 res;u8 type; };drivers/staging/media/atomisp/i2c/ov2680.h +0
-68@@ -850,74 +850,6 @@ struct ov2680_format { };#define N_RES_PREVIEW (ARRAY_SIZE(ov2680_res_preview)) -static struct ov2680_resolution ov2680_res_still[] = { - { - .desc ="ov2680_1616x1216_30fps" , - .width =1616 , - .height =1216 , - .pix_clk_freq =66 , - .fps =30 , - .used =0 , - .pixels_per_line =1698 ,//1704, - .lines_per_frame =1294 , - .bin_factor_x =0 , - .bin_factor_y =0 , - .bin_mode =0 , - .skip_frames =3 , - .regs = ov2680_1616x1216_30fps, - }, - { - .desc ="ov2680_1616x916_30fps" , - .width =1616 , - .height =916 , - .fps =30 , - .pix_clk_freq =66 , - .used =0 , - .pixels_per_line =1698 ,//1704, - .lines_per_frame =1294 , - .bin_factor_x =0 , - .bin_factor_y =0 , - .bin_mode =0 , - .skip_frames =3 , - .regs = ov2680_1616x916_30fps, - }, -}; -#define N_RES_STILL (ARRAY_SIZE(ov2680_res_still)) - -static struct ov2680_resolution ov2680_res_video[] = { - { - .desc ="ov2680_1616x1216_30fps" , - .width =1616 , - .height =1216 , - .pix_clk_freq =66 , - .fps =30 , - .used =0 , - .pixels_per_line =1698 ,//1704, - .lines_per_frame =1294 , - .bin_factor_x =0 , - .bin_factor_y =0 , - .bin_mode =0 , - .skip_frames =3 , - .regs = ov2680_1616x1216_30fps, - }, - { - .desc ="ov2680_720p_30fps" , - .width =1616 , - .height =916 , - .fps =30 , - .pix_clk_freq =66 , - .used =0 , - .pixels_per_line =1698 ,//1704, - .lines_per_frame =1294 , - .bin_factor_x =0 , - .bin_factor_y =0 , - .bin_mode =0 , - .skip_frames =3 , - .regs = ov2680_1616x916_30fps, - }, -}; -#define N_RES_VIDEO (ARRAY_SIZE(ov2680_res_video)) -static struct ov2680_resolution *ov2680_res = ov2680_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c +0
-27@@ -1825,38 +1825,12 @@ static int ov5693_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = ov5693_res[dev->fmt_idx].fps; }return 0 ; } -static int ov5693_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct ov5693_device *dev =to_ov5693_sensor (sd); - - dev->run_mode = param->parm.capture.capturemode; - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - ov5693_res = ov5693_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - ov5693_res = ov5693_res_still; -N_RES =N_RES_STILL ; -break ; -default : - ov5693_res = ov5693_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int ov5693_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {@@ -1900,7 +1874,6 @@ static int ov5693_enum_frame_size(struct v4l2_subdev *sd,static const struct v4l2_subdev_video_ops ov5693_video_ops = { .s_stream = ov5693_s_stream, .g_parm = ov5693_g_parm, - .s_parm = ov5693_s_parm, .g_frame_interval = ov5693_g_frame_interval, };drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c +2
-7@@ -2091,7 +2091,7 @@ int atomisp_set_sensor_runmode(struct atomisp_sub_device *asd,struct atomisp_device *isp = asd->isp;struct v4l2_ctrl *c;struct v4l2_streamparm p = {0 }; -int ret; +int ret =0 ;int modes[] = {CI_MODE_NONE ,CI_MODE_VIDEO ,CI_MODE_STILL_CAPTURE ,@@ -2105,13 +2105,8 @@ int atomisp_set_sensor_runmode(struct atomisp_sub_device *asd, c =v4l2_ctrl_find (isp->inputs[asd->input_curr].camera->ctrl_handler,V4L2_CID_RUN_MODE ); -if (c) { +if (c) ret =v4l2_ctrl_s_ctrl (c, runmode->mode); - }else { - p.parm.capture.capturemode = modes[runmode->mode]; - ret =v4l2_subdev_call (isp->inputs[asd->input_curr].camera, - video, s_parm, &p); - }mutex_unlock (asd->ctrl_handler.lock);return ret;drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c +0
-6@@ -819,12 +819,6 @@ static int __atomisp_update_run_mode(struct atomisp_sub_device *asd)struct atomisp_device *isp = asd->isp;struct v4l2_ctrl *ctrl = asd->run_mode;struct v4l2_ctrl *c; -struct v4l2_streamparm p = {0 }; -int modes[] = {CI_MODE_NONE , -CI_MODE_VIDEO , -CI_MODE_STILL_CAPTURE , -CI_MODE_CONTINUOUS , -CI_MODE_PREVIEW };s32 mode; if (ctrl->val != ATOMISP_RUN_MODE_VIDEO &&@@ -840,11 +834,7 @@ static int __atomisp_update_run_mode(struct atomisp_sub_device *asd)if (c)return v4l2_ctrl_s_ctrl (c, mode);
drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c static int __atomisp_update_run_mode(struct atomisp_sub_device *asd) · line 840
Quoted 10 lines
drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c +1
-5-/* Fall back to obsolete s_parm */ - p.parm.capture.capturemode = modes[mode]; - -return v4l2_subdev_call ( - isp->inputs[asd->input_curr].camera, video, s_parm, &p); +return 0 ; }int atomisp_update_run_mode (struct atomisp_sub_device *asd)
Thanks,
Mauro
Re: [PATCHv2 3/9] staging: atomisp: Kill subdev s_parm abuse
Quoted 5 lines · Mauro Carvalho Chehab
Sakari,
Em Mon, 22 Jan 2018 13:31:19 +0100
Hans Verkuil <[email protected]> escreveu:
Quoted 7 lines
Quoted 4 lines
From: Sakari Ailus <[email protected]>
Remove sensor driver's interface that made use of use case specific knowledge of platform capabilities.
Could you better describe it? What
s_paramabuse? What happens after this patch? It seems that atomISP relies on
I'd like to remind you this is a staging driver that got where it is without any review. If you insist on improving the commit message, then this is what I propose:
Remove sensor driver's interface for setting the use case specific mode list as well as the mode lists that are related to other than CI_MODE_PREVIEW. This removes s_parm abuse in using driver specific values in v4l2_streamparm.capture.capturemode. The drivers already support [gs]_frame_interval so removing support for [gs]_parm is enough.
Quoted 493 lines
gc0310_res. So, I would be expecting that a patch removings_paramwould be also adding/changing other parts of the code accordingly, in order to get rid of that as a hole (or initialize it somewhere else).Regards,
MauroQuoted 470 lines
Signed-off-by Sakari Ailus <[email protected]>Signed-off-by Hans Verkuil <[email protected]>--- drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 26 --------- drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 26 --------- drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 29 --------- drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 26 --------- drivers/staging/media/atomisp/i2c/gc0310.h | 43 -------------- drivers/staging/media/atomisp/i2c/gc2235.h | 1 - drivers/staging/media/atomisp/i2c/ov2680.h | 68 ---------------------- .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 27 --------- .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 9 +-- .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 12 +--- 10 files changed, 3 insertions(+), 264 deletions(-)drivers/staging/media/atomisp/i2c/atomisp-gc0310.c +0
-26@@ -1224,37 +1224,12 @@ static int gc0310_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = gc0310_res[dev->fmt_idx].fps; }return 0 ; } -static int gc0310_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct gc0310_device *dev =to_gc0310_sensor (sd); - dev->run_mode = param->parm.capture.capturemode; - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - gc0310_res = gc0310_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - gc0310_res = gc0310_res_still; -N_RES =N_RES_STILL ; -break ; -default : - gc0310_res = gc0310_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int gc0310_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {@@ -1314,7 +1289,6 @@ static const struct v4l2_subdev_sensor_ops gc0310_sensor_ops = {static const struct v4l2_subdev_video_ops gc0310_video_ops = { .s_stream = gc0310_s_stream, .g_parm = gc0310_g_parm, - .s_parm = gc0310_s_parm, .g_frame_interval = gc0310_g_frame_interval, };drivers/staging/media/atomisp/i2c/atomisp-gc2235.c +0
-26@@ -964,37 +964,12 @@ static int gc2235_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = gc2235_res[dev->fmt_idx].fps; }return 0 ; } -static int gc2235_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct gc2235_device *dev =to_gc2235_sensor (sd); - dev->run_mode = param->parm.capture.capturemode; - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - gc2235_res = gc2235_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - gc2235_res = gc2235_res_still; -N_RES =N_RES_STILL ; -break ; -default : - gc2235_res = gc2235_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int gc2235_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {@@ -1053,7 +1028,6 @@ static const struct v4l2_subdev_sensor_ops gc2235_sensor_ops = {static const struct v4l2_subdev_video_ops gc2235_video_ops = { .s_stream = gc2235_s_stream, .g_parm = gc2235_g_parm, - .s_parm = gc2235_s_parm, .g_frame_interval = gc2235_g_frame_interval, };drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +0
-29@@ -1300,40 +1300,12 @@ static int ov2680_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = ov2680_res[dev->fmt_idx].fps; }return 0 ; } -static int ov2680_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct ov2680_device *dev =to_ov2680_sensor (sd); -struct i2c_client *client =v4l2_get_subdevdata (sd); - dev->run_mode = param->parm.capture.capturemode; - -v4l2_info (client,"\n%s:run_mode :%x\n" , __func__, dev->run_mode); - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - ov2680_res = ov2680_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - ov2680_res = ov2680_res_still; -N_RES =N_RES_STILL ; -break ; -default : - ov2680_res = ov2680_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int ov2680_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {@@ -1388,7 +1360,6 @@ static int ov2680_g_skip_frames(struct v4l2_subdev *sd, u32 *frames)static const struct v4l2_subdev_video_ops ov2680_video_ops = { .s_stream = ov2680_s_stream, .g_parm = ov2680_g_parm, - .s_parm = ov2680_s_parm, .g_frame_interval = ov2680_g_frame_interval, };drivers/staging/media/atomisp/i2c/atomisp-ov2722.c +0
-26@@ -1103,37 +1103,12 @@ static int ov2722_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = ov2722_res[dev->fmt_idx].fps; }return 0 ; } -static int ov2722_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct ov2722_device *dev =to_ov2722_sensor (sd); - dev->run_mode = param->parm.capture.capturemode; - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - ov2722_res = ov2722_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - ov2722_res = ov2722_res_still; -N_RES =N_RES_STILL ; -break ; -default : - ov2722_res = ov2722_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int ov2722_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {@@ -1193,7 +1168,6 @@ static const struct v4l2_subdev_sensor_ops ov2722_sensor_ops = {static const struct v4l2_subdev_video_ops ov2722_video_ops = { .s_stream = ov2722_s_stream, .g_parm = ov2722_g_parm, - .s_parm = ov2722_s_parm, .g_frame_interval = ov2722_g_frame_interval, };drivers/staging/media/atomisp/i2c/gc0310.h +0
-43@@ -150,7 +150,6 @@ struct gc0310_device {struct camera_sensor_platform_data *platform_data;int vt_pix_clk_freq_mhz;int fmt_idx; -int run_mode;u8 res;u8 type; };@@ -400,48 +399,6 @@ struct gc0310_resolution gc0310_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(gc0310_res_preview)) -struct gc0310_resolution gc0310_res_still[] = { - { - .desc ="gc0310_VGA_30fps" , - .width =656 ,// 648, - .height =496 ,// 488, - .fps =30 , -//.pix_clk_freq = 73, - .used =0 , -#if 0 - .pixels_per_line =0x0314 , - .lines_per_frame =0x0213 , -#endif - .bin_factor_x =1 , - .bin_factor_y =1 , - .bin_mode =0 , - .skip_frames =2 , - .regs = gc0310_VGA_30fps, - }, -}; -#define N_RES_STILL (ARRAY_SIZE(gc0310_res_still)) - -struct gc0310_resolution gc0310_res_video[] = { - { - .desc ="gc0310_VGA_30fps" , - .width =656 ,// 648, - .height =496 ,// 488, - .fps =30 , -//.pix_clk_freq = 73, - .used =0 , -#if 0 - .pixels_per_line =0x0314 , - .lines_per_frame =0x0213 , -#endif - .bin_factor_x =1 , - .bin_factor_y =1 , - .bin_mode =0 , - .skip_frames =2 , - .regs = gc0310_VGA_30fps, - }, -}; -#define N_RES_VIDEO (ARRAY_SIZE(gc0310_res_video)) -static struct gc0310_resolution *gc0310_res = gc0310_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;#endif drivers/staging/media/atomisp/i2c/gc2235.h +0
-1@@ -156,7 +156,6 @@ struct gc2235_device {struct camera_sensor_platform_data *platform_data;int vt_pix_clk_freq_mhz;int fmt_idx; -int run_mode;u8 res;u8 type; };drivers/staging/media/atomisp/i2c/ov2680.h +0
-68@@ -850,74 +850,6 @@ struct ov2680_format { };#define N_RES_PREVIEW (ARRAY_SIZE(ov2680_res_preview)) -static struct ov2680_resolution ov2680_res_still[] = { - { - .desc ="ov2680_1616x1216_30fps" , - .width =1616 , - .height =1216 , - .pix_clk_freq =66 , - .fps =30 , - .used =0 , - .pixels_per_line =1698 ,//1704, - .lines_per_frame =1294 , - .bin_factor_x =0 , - .bin_factor_y =0 , - .bin_mode =0 , - .skip_frames =3 , - .regs = ov2680_1616x1216_30fps, - }, - { - .desc ="ov2680_1616x916_30fps" , - .width =1616 , - .height =916 , - .fps =30 , - .pix_clk_freq =66 , - .used =0 , - .pixels_per_line =1698 ,//1704, - .lines_per_frame =1294 , - .bin_factor_x =0 , - .bin_factor_y =0 , - .bin_mode =0 , - .skip_frames =3 , - .regs = ov2680_1616x916_30fps, - }, -}; -#define N_RES_STILL (ARRAY_SIZE(ov2680_res_still)) - -static struct ov2680_resolution ov2680_res_video[] = { - { - .desc ="ov2680_1616x1216_30fps" , - .width =1616 , - .height =1216 , - .pix_clk_freq =66 , - .fps =30 , - .used =0 , - .pixels_per_line =1698 ,//1704, - .lines_per_frame =1294 , - .bin_factor_x =0 , - .bin_factor_y =0 , - .bin_mode =0 , - .skip_frames =3 , - .regs = ov2680_1616x1216_30fps, - }, - { - .desc ="ov2680_720p_30fps" , - .width =1616 , - .height =916 , - .fps =30 , - .pix_clk_freq =66 , - .used =0 , - .pixels_per_line =1698 ,//1704, - .lines_per_frame =1294 , - .bin_factor_x =0 , - .bin_factor_y =0 , - .bin_mode =0 , - .skip_frames =3 , - .regs = ov2680_1616x916_30fps, - }, -}; -#define N_RES_VIDEO (ARRAY_SIZE(ov2680_res_video)) -static struct ov2680_resolution *ov2680_res = ov2680_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c +0
-27@@ -1825,38 +1825,12 @@ static int ov5693_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = ov5693_res[dev->fmt_idx].fps; }return 0 ; } -static int ov5693_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct ov5693_device *dev =to_ov5693_sensor (sd); - - dev->run_mode = param->parm.capture.capturemode; - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - ov5693_res = ov5693_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - ov5693_res = ov5693_res_still; -N_RES =N_RES_STILL ; -break ; -default : - ov5693_res = ov5693_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int ov5693_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {@@ -1900,7 +1874,6 @@ static int ov5693_enum_frame_size(struct v4l2_subdev *sd,static const struct v4l2_subdev_video_ops ov5693_video_ops = { .s_stream = ov5693_s_stream, .g_parm = ov5693_g_parm, - .s_parm = ov5693_s_parm, .g_frame_interval = ov5693_g_frame_interval, };drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c +2
-7@@ -2091,7 +2091,7 @@ int atomisp_set_sensor_runmode(struct atomisp_sub_device *asd,struct atomisp_device *isp = asd->isp;struct v4l2_ctrl *c;struct v4l2_streamparm p = {0 }; -int ret; +int ret =0 ;int modes[] = {CI_MODE_NONE ,CI_MODE_VIDEO ,CI_MODE_STILL_CAPTURE ,@@ -2105,13 +2105,8 @@ int atomisp_set_sensor_runmode(struct atomisp_sub_device *asd, c =v4l2_ctrl_find (isp->inputs[asd->input_curr].camera->ctrl_handler,V4L2_CID_RUN_MODE ); -if (c) { +if (c) ret =v4l2_ctrl_s_ctrl (c, runmode->mode); - }else { - p.parm.capture.capturemode = modes[runmode->mode]; - ret =v4l2_subdev_call (isp->inputs[asd->input_curr].camera, - video, s_parm, &p); - }mutex_unlock (asd->ctrl_handler.lock);return ret;drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c +0
-6@@ -819,12 +819,6 @@ static int __atomisp_update_run_mode(struct atomisp_sub_device *asd)struct atomisp_device *isp = asd->isp;struct v4l2_ctrl *ctrl = asd->run_mode;struct v4l2_ctrl *c; -struct v4l2_streamparm p = {0 }; -int modes[] = {CI_MODE_NONE , -CI_MODE_VIDEO , -CI_MODE_STILL_CAPTURE , -CI_MODE_CONTINUOUS , -CI_MODE_PREVIEW };s32 mode; if (ctrl->val != ATOMISP_RUN_MODE_VIDEO &&@@ -840,11 +834,7 @@ static int __atomisp_update_run_mode(struct atomisp_sub_device *asd)if (c)return v4l2_ctrl_s_ctrl (c, mode);drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c static int __atomisp_update_run_mode(struct atomisp_sub_device *asd) · line 840
Quoted 10 lines
drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c +1
-5-/* Fall back to obsolete s_parm */ - p.parm.capture.capturemode = modes[mode]; - -return v4l2_subdev_call ( - isp->inputs[asd->input_curr].camera, video, s_parm, &p); +return 0 ; }int atomisp_update_run_mode (struct atomisp_sub_device *asd)Thanks,
Mauro
Signature · 2 lines
Sakari Ailus e-mail: [email protected]
Re: [PATCHv2 3/9] staging: atomisp: Kill subdev s_parm abuse
Em Fri, 16 Feb 2018 11:04:36 +0200
Sakari Ailus <[email protected]> escreveu:
Quoted 8 lines · Mauro Carvalho Chehab
Quoted 7 lines
Sakari,
Em Mon, 22 Jan 2018 13:31:19 +0100
Hans Verkuil <[email protected]> escreveu:Quoted 2 lines
From: Sakari Ailus <[email protected]>
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Remove sensor driver's interface that made use of use case specific knowledge of platform capabilities.
Could you better describe it? What
s_paramabuse? What happens after this patch? It seems that atomISP relies onI'd like to remind you this is a staging driver that got where it is without any review.
Ok, but this is not an excuse to not properly document any further patches to it.
Quoted 8 lines
If you insist on improving the commit message, then this is what I propose:
Remove sensor driver's interface for setting the use case specific mode list as well as the mode lists that are related to other than
CI_MODE_PREVIEW. This removess_parmabuse in using driver specific values in v4l2_streamparm.capture.capturemode. The drivers already support [gs]_frame_interval so removing support for [gs]_parm is enough.
Works for me.
Quoted 488 lines
Quoted 488 lines
gc0310_res. So, I would be expecting that a patch removings_paramwould be also adding/changing other parts of the code accordingly, in order to get rid of that as a hole (or initialize it somewhere else).Regards,
MauroQuoted 479 lines
Signed-off-by Sakari Ailus <[email protected]>Signed-off-by Hans Verkuil <[email protected]>--- drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 26 --------- drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 26 --------- drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 29 --------- drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 26 --------- drivers/staging/media/atomisp/i2c/gc0310.h | 43 -------------- drivers/staging/media/atomisp/i2c/gc2235.h | 1 - drivers/staging/media/atomisp/i2c/ov2680.h | 68 ---------------------- .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 27 --------- .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 9 +-- .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 12 +--- 10 files changed, 3 insertions(+), 264 deletions(-)drivers/staging/media/atomisp/i2c/atomisp-gc0310.c +0
-26@@ -1224,37 +1224,12 @@ static int gc0310_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = gc0310_res[dev->fmt_idx].fps; }return 0 ; } -static int gc0310_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct gc0310_device *dev =to_gc0310_sensor (sd); - dev->run_mode = param->parm.capture.capturemode; - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - gc0310_res = gc0310_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - gc0310_res = gc0310_res_still; -N_RES =N_RES_STILL ; -break ; -default : - gc0310_res = gc0310_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int gc0310_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {@@ -1314,7 +1289,6 @@ static const struct v4l2_subdev_sensor_ops gc0310_sensor_ops = {static const struct v4l2_subdev_video_ops gc0310_video_ops = { .s_stream = gc0310_s_stream, .g_parm = gc0310_g_parm, - .s_parm = gc0310_s_parm, .g_frame_interval = gc0310_g_frame_interval, };drivers/staging/media/atomisp/i2c/atomisp-gc2235.c +0
-26@@ -964,37 +964,12 @@ static int gc2235_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = gc2235_res[dev->fmt_idx].fps; }return 0 ; } -static int gc2235_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct gc2235_device *dev =to_gc2235_sensor (sd); - dev->run_mode = param->parm.capture.capturemode; - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - gc2235_res = gc2235_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - gc2235_res = gc2235_res_still; -N_RES =N_RES_STILL ; -break ; -default : - gc2235_res = gc2235_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int gc2235_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {@@ -1053,7 +1028,6 @@ static const struct v4l2_subdev_sensor_ops gc2235_sensor_ops = {static const struct v4l2_subdev_video_ops gc2235_video_ops = { .s_stream = gc2235_s_stream, .g_parm = gc2235_g_parm, - .s_parm = gc2235_s_parm, .g_frame_interval = gc2235_g_frame_interval, };drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +0
-29@@ -1300,40 +1300,12 @@ static int ov2680_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = ov2680_res[dev->fmt_idx].fps; }return 0 ; } -static int ov2680_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct ov2680_device *dev =to_ov2680_sensor (sd); -struct i2c_client *client =v4l2_get_subdevdata (sd); - dev->run_mode = param->parm.capture.capturemode; - -v4l2_info (client,"\n%s:run_mode :%x\n" , __func__, dev->run_mode); - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - ov2680_res = ov2680_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - ov2680_res = ov2680_res_still; -N_RES =N_RES_STILL ; -break ; -default : - ov2680_res = ov2680_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int ov2680_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {@@ -1388,7 +1360,6 @@ static int ov2680_g_skip_frames(struct v4l2_subdev *sd, u32 *frames)static const struct v4l2_subdev_video_ops ov2680_video_ops = { .s_stream = ov2680_s_stream, .g_parm = ov2680_g_parm, - .s_parm = ov2680_s_parm, .g_frame_interval = ov2680_g_frame_interval, };drivers/staging/media/atomisp/i2c/atomisp-ov2722.c +0
-26@@ -1103,37 +1103,12 @@ static int ov2722_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = ov2722_res[dev->fmt_idx].fps; }return 0 ; } -static int ov2722_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct ov2722_device *dev =to_ov2722_sensor (sd); - dev->run_mode = param->parm.capture.capturemode; - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - ov2722_res = ov2722_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - ov2722_res = ov2722_res_still; -N_RES =N_RES_STILL ; -break ; -default : - ov2722_res = ov2722_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int ov2722_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {@@ -1193,7 +1168,6 @@ static const struct v4l2_subdev_sensor_ops ov2722_sensor_ops = {static const struct v4l2_subdev_video_ops ov2722_video_ops = { .s_stream = ov2722_s_stream, .g_parm = ov2722_g_parm, - .s_parm = ov2722_s_parm, .g_frame_interval = ov2722_g_frame_interval, };drivers/staging/media/atomisp/i2c/gc0310.h +0
-43@@ -150,7 +150,6 @@ struct gc0310_device {struct camera_sensor_platform_data *platform_data;int vt_pix_clk_freq_mhz;int fmt_idx; -int run_mode;u8 res;u8 type; };@@ -400,48 +399,6 @@ struct gc0310_resolution gc0310_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(gc0310_res_preview)) -struct gc0310_resolution gc0310_res_still[] = { - { - .desc ="gc0310_VGA_30fps" , - .width =656 ,// 648, - .height =496 ,// 488, - .fps =30 , -//.pix_clk_freq = 73, - .used =0 , -#if 0 - .pixels_per_line =0x0314 , - .lines_per_frame =0x0213 , -#endif - .bin_factor_x =1 , - .bin_factor_y =1 , - .bin_mode =0 , - .skip_frames =2 , - .regs = gc0310_VGA_30fps, - }, -}; -#define N_RES_STILL (ARRAY_SIZE(gc0310_res_still)) - -struct gc0310_resolution gc0310_res_video[] = { - { - .desc ="gc0310_VGA_30fps" , - .width =656 ,// 648, - .height =496 ,// 488, - .fps =30 , -//.pix_clk_freq = 73, - .used =0 , -#if 0 - .pixels_per_line =0x0314 , - .lines_per_frame =0x0213 , -#endif - .bin_factor_x =1 , - .bin_factor_y =1 , - .bin_mode =0 , - .skip_frames =2 , - .regs = gc0310_VGA_30fps, - }, -}; -#define N_RES_VIDEO (ARRAY_SIZE(gc0310_res_video)) -static struct gc0310_resolution *gc0310_res = gc0310_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;#endif drivers/staging/media/atomisp/i2c/gc2235.h +0
-1@@ -156,7 +156,6 @@ struct gc2235_device {struct camera_sensor_platform_data *platform_data;int vt_pix_clk_freq_mhz;int fmt_idx; -int run_mode;u8 res;u8 type; };drivers/staging/media/atomisp/i2c/ov2680.h +0
-68@@ -850,74 +850,6 @@ struct ov2680_format { };#define N_RES_PREVIEW (ARRAY_SIZE(ov2680_res_preview)) -static struct ov2680_resolution ov2680_res_still[] = { - { - .desc ="ov2680_1616x1216_30fps" , - .width =1616 , - .height =1216 , - .pix_clk_freq =66 , - .fps =30 , - .used =0 , - .pixels_per_line =1698 ,//1704, - .lines_per_frame =1294 , - .bin_factor_x =0 , - .bin_factor_y =0 , - .bin_mode =0 , - .skip_frames =3 , - .regs = ov2680_1616x1216_30fps, - }, - { - .desc ="ov2680_1616x916_30fps" , - .width =1616 , - .height =916 , - .fps =30 , - .pix_clk_freq =66 , - .used =0 , - .pixels_per_line =1698 ,//1704, - .lines_per_frame =1294 , - .bin_factor_x =0 , - .bin_factor_y =0 , - .bin_mode =0 , - .skip_frames =3 , - .regs = ov2680_1616x916_30fps, - }, -}; -#define N_RES_STILL (ARRAY_SIZE(ov2680_res_still)) - -static struct ov2680_resolution ov2680_res_video[] = { - { - .desc ="ov2680_1616x1216_30fps" , - .width =1616 , - .height =1216 , - .pix_clk_freq =66 , - .fps =30 , - .used =0 , - .pixels_per_line =1698 ,//1704, - .lines_per_frame =1294 , - .bin_factor_x =0 , - .bin_factor_y =0 , - .bin_mode =0 , - .skip_frames =3 , - .regs = ov2680_1616x1216_30fps, - }, - { - .desc ="ov2680_720p_30fps" , - .width =1616 , - .height =916 , - .fps =30 , - .pix_clk_freq =66 , - .used =0 , - .pixels_per_line =1698 ,//1704, - .lines_per_frame =1294 , - .bin_factor_x =0 , - .bin_factor_y =0 , - .bin_mode =0 , - .skip_frames =3 , - .regs = ov2680_1616x916_30fps, - }, -}; -#define N_RES_VIDEO (ARRAY_SIZE(ov2680_res_video)) -static struct ov2680_resolution *ov2680_res = ov2680_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c +0
-27@@ -1825,38 +1825,12 @@ static int ov5693_g_parm(struct v4l2_subdev *sd,if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.capturemode = dev->run_mode; param->parm.capture.timeperframe.denominator = ov5693_res[dev->fmt_idx].fps; }return 0 ; } -static int ov5693_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct ov5693_device *dev =to_ov5693_sensor (sd); - - dev->run_mode = param->parm.capture.capturemode; - -mutex_lock (&dev->input_lock); -switch (dev->run_mode) { -case CI_MODE_VIDEO : - ov5693_res = ov5693_res_video; -N_RES =N_RES_VIDEO ; -break ; -case CI_MODE_STILL_CAPTURE : - ov5693_res = ov5693_res_still; -N_RES =N_RES_STILL ; -break ; -default : - ov5693_res = ov5693_res_preview; -N_RES =N_RES_PREVIEW ; - } -mutex_unlock (&dev->input_lock); -return 0 ; -} -static int ov5693_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {@@ -1900,7 +1874,6 @@ static int ov5693_enum_frame_size(struct v4l2_subdev *sd,static const struct v4l2_subdev_video_ops ov5693_video_ops = { .s_stream = ov5693_s_stream, .g_parm = ov5693_g_parm, - .s_parm = ov5693_s_parm, .g_frame_interval = ov5693_g_frame_interval, };drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c +2
-7@@ -2091,7 +2091,7 @@ int atomisp_set_sensor_runmode(struct atomisp_sub_device *asd,struct atomisp_device *isp = asd->isp;struct v4l2_ctrl *c;struct v4l2_streamparm p = {0 }; -int ret; +int ret =0 ;int modes[] = {CI_MODE_NONE ,CI_MODE_VIDEO ,CI_MODE_STILL_CAPTURE ,@@ -2105,13 +2105,8 @@ int atomisp_set_sensor_runmode(struct atomisp_sub_device *asd, c =v4l2_ctrl_find (isp->inputs[asd->input_curr].camera->ctrl_handler,V4L2_CID_RUN_MODE ); -if (c) { +if (c) ret =v4l2_ctrl_s_ctrl (c, runmode->mode); - }else { - p.parm.capture.capturemode = modes[runmode->mode]; - ret =v4l2_subdev_call (isp->inputs[asd->input_curr].camera, - video, s_parm, &p); - }mutex_unlock (asd->ctrl_handler.lock);return ret;drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c +1
-11@@ -819,12 +819,6 @@ static int __atomisp_update_run_mode(struct atomisp_sub_device *asd)struct atomisp_device *isp = asd->isp;struct v4l2_ctrl *ctrl = asd->run_mode;struct v4l2_ctrl *c; -struct v4l2_streamparm p = {0 }; -int modes[] = {CI_MODE_NONE , -CI_MODE_VIDEO , -CI_MODE_STILL_CAPTURE , -CI_MODE_CONTINUOUS , -CI_MODE_PREVIEW };s32 mode; if (ctrl->val != ATOMISP_RUN_MODE_VIDEO &&@@ -840,11 +834,7 @@ static int __atomisp_update_run_mode(struct atomisp_sub_device *asd)if (c)return v4l2_ctrl_s_ctrl (c, mode); -/* Fall back to obsolete s_parm */ - p.parm.capture.capturemode = modes[mode]; - -return v4l2_subdev_call ( - isp->inputs[asd->input_curr].camera, video, s_parm, &p); +return 0 ; }
Quoted 7 lines
Quoted 6 lines
drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c static int __atomisp_update_run_mode(struct atomisp_sub_device *asd) · line 840
Quoted 1 line
drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c +0
-0int atomisp_update_run_mode (struct atomisp_sub_device *asd)Thanks,
Mauro
Thanks,
Mauro
Re: [PATCHv2 3/9] staging: atomisp: Kill subdev s_parm abuse
Quoted 26 lines · Mauro Carvalho Chehab
Em Fri, 16 Feb 2018 11:04:36 +0200
Sakari Ailus <[email protected]> escreveu:Quoted 8 lines · Mauro Carvalho Chehab
Quoted 7 lines
Sakari,
Em Mon, 22 Jan 2018 13:31:19 +0100
Hans Verkuil <[email protected]> escreveu:Quoted 2 lines
From: Sakari Ailus <[email protected]>
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Remove sensor driver's interface that made use of use case specific knowledge of platform capabilities.
Could you better describe it? What
s_paramabuse? What happens after this patch? It seems that atomISP relies onI'd like to remind you this is a staging driver that got where it is without any review.
Ok, but this is not an excuse to not properly document any further patches to it.
Quoted 3 lines
If you insist on improving the commit message, then this is what I propose:
Quoted 7 lines
Quoted 5 lines
Remove sensor driver's interface for setting the use case specific mode list as well as the mode lists that are related to other than
CI_MODE_PREVIEW. This removess_parmabuse in using driver specific values in v4l2_streamparm.capture.capturemode. The drivers already support [gs]_frame_interval so removing support for [gs]_parm is enough.Works for me.
I'll update the commit message for this patch.
Regards,
Hans
PATCH v2 4/9 staging: atomisp: i2c: Disable non-preview configurations
In reply to Hans VerkuilFrom: Sakari Ailus <[email protected]>
Disable configurations for non-preview modes until configuration selection is improved.
--- drivers/staging/media/atomisp/i2c/gc2235.h | 2 ++ drivers/staging/media/atomisp/i2c/ov2722.h | 2 ++ drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 2 ++ 3 files changed, 6 insertions(+)
drivers/staging/media/atomisp/i2c/gc2235.h +2 -0
@@ -574,6 +574,7 @@ static struct gc2235_resolution gc2235_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(gc2235_res_preview)) +#if 0 /* Disable non-previes configurations for now */ static struct gc2235_resolution gc2235_res_still[] = { { .desc = "gc2235_1600_900_30fps",
@@ -658,6 +659,7 @@ static struct gc2235_resolution gc2235_res_video[] = { };#define N_RES_VIDEO (ARRAY_SIZE(gc2235_res_video)) +#endif static struct gc2235_resolution *gc2235_res = gc2235_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;
drivers/staging/media/atomisp/i2c/ov2722.h +2 -0
@@ -1148,6 +1148,7 @@ struct ov2722_resolution ov2722_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(ov2722_res_preview)) +#if 0 /* Disable non-previes configurations for now */ struct ov2722_resolution ov2722_res_still[] = { { .desc = "ov2722_480P_30fps",
@@ -1250,6 +1251,7 @@ struct ov2722_resolution ov2722_res_video[] = { }, };#define N_RES_VIDEO (ARRAY_SIZE(ov2722_res_video)) +#endif static struct ov2722_resolution *ov2722_res = ov2722_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;
drivers/staging/media/atomisp/i2c/ov5693/ov5693.h +2 -0
@@ -1147,6 +1147,7 @@ struct ov5693_resolution ov5693_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(ov5693_res_preview)) +#if 0 /* Disable non-previes configurations for now */ struct ov5693_resolution ov5693_res_still[] = { { .desc = "ov5693_736x496_30fps",
@@ -1364,6 +1365,7 @@ struct ov5693_resolution ov5693_res_video[] = { }, };#define N_RES_VIDEO (ARRAY_SIZE(ov5693_res_video)) +#endif static struct ov5693_resolution *ov5693_res = ov5693_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;
Signature · 1 line
2.15.1
Re: [PATCHv2 4/9] staging: atomisp: i2c: Disable non-preview configurations
Em Mon, 22 Jan 2018 13:31:20 +0100
Hans Verkuil <[email protected]> escreveu:
Quoted 4 lines
From: Sakari Ailus <[email protected]>
Disable configurations for non-preview modes until configuration selection is improved.
Again, a poor description. It just repeats the subject. A good subject/description should answer 3 questions:
what?
why?
how?
Anyway, looking at this patch's contents, it partially answers my questions:
the previous patch do cause regressions at the code.
Ok, this is staging. So, we don't have very strict rules here, but still causing regressions without providing a very good reason why sucks.
I would also merge this with the previous one, in order to place all regressions on a single patch.
Quoted 14 lines
Signed-off-by Sakari Ailus <[email protected]>Signed-off-by Hans Verkuil <[email protected]>--- drivers/staging/media/atomisp/i2c/gc2235.h | 2 ++ drivers/staging/media/atomisp/i2c/ov2722.h | 2 ++ drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 2 ++ 3 files changed, 6 insertions(+)drivers/staging/media/atomisp/i2c/gc2235.h +0
-0
drivers/staging/media/atomisp/i2c/gc2235.h static struct gc2235_resolution gc2235_res_preview[] = { · line 577
Quoted 4 lines
drivers/staging/media/atomisp/i2c/gc2235.h +1
-0@@ -574,6 +574,7 @@ static struct gc2235_resolution gc2235_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(gc2235_res_preview)) +#if 0 /* Disable non-previes configurations for now */
typo (here and other cut-and-paste paces)
non-previes -> non-previews
also, please add a FIXME: or HACK: and describe the need for a fix on atomisp TODO file.
Quoted 44 lines
drivers/staging/media/atomisp/i2c/gc2235.h +1
-0static struct gc2235_resolution gc2235_res_still[] = { { .desc ="gc2235_1600_900_30fps" ,@@ -658,6 +659,7 @@ static struct gc2235_resolution gc2235_res_video[] = { };#define N_RES_VIDEO (ARRAY_SIZE(gc2235_res_video)) +#endif static struct gc2235_resolution *gc2235_res = gc2235_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;drivers/staging/media/atomisp/i2c/ov2722.h +2
-0@@ -1148,6 +1148,7 @@ struct ov2722_resolution ov2722_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(ov2722_res_preview)) +#if 0 /* Disable non-previes configurations for now */ struct ov2722_resolution ov2722_res_still[] = { { .desc = "ov2722_480P_30fps",@@ -1250,6 +1251,7 @@ struct ov2722_resolution ov2722_res_video[] = { }, };#define N_RES_VIDEO (ARRAY_SIZE(ov2722_res_video)) +#endif static struct ov2722_resolution *ov2722_res = ov2722_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;drivers/staging/media/atomisp/i2c/ov5693/ov5693.h +1
-0@@ -1147,6 +1147,7 @@ struct ov5693_resolution ov5693_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(ov5693_res_preview)) +#if 0 /* Disable non-previes configurations for now */ struct ov5693_resolution ov5693_res_still[] = { { .desc = "ov5693_736x496_30fps",
drivers/staging/media/atomisp/i2c/ov5693/ov5693.h struct ov5693_resolution ov5693_res_video[] = { · line 1371
Quoted 7 lines
drivers/staging/media/atomisp/i2c/ov5693/ov5693.h +1
-0@@ -1364,6 +1365,7 @@ struct ov5693_resolution ov5693_res_video[] = { }, };#define N_RES_VIDEO (ARRAY_SIZE(ov5693_res_video)) +#endif static struct ov5693_resolution *ov5693_res = ov5693_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;
Thanks,
Mauro
Re: [PATCHv2 4/9] staging: atomisp: i2c: Disable non-preview configurations
Hi Mauro,
Quoted 18 lines · Mauro Carvalho Chehab
Em Mon, 22 Jan 2018 13:31:20 +0100
Hans Verkuil <[email protected]> escreveu:Quoted 4 lines
From: Sakari Ailus <[email protected]>
Disable configurations for non-preview modes until configuration selection is improved.
Again, a poor description. It just repeats the subject. A good subject/description should answer 3 questions:
what?
why?
how?Anyway, looking at this patch's contents, it partially answers my questions:
Quoted 8 lines
the previous patch do cause regressions at the code.
Ok, this is staging. So, we don't have very strict rules here, but still causing regressions without providing a very good reason why sucks.
I would also merge this with the previous one, in order to place all regressions on a single patch.
It's trivial to bring back the configurations disabled here by just reverting this patch. The other patch does not disable any. That's why they're separate.
Quoted 83 lines
Quoted 16 lines
Signed-off-by Sakari Ailus <[email protected]>Signed-off-by Hans Verkuil <[email protected]>--- drivers/staging/media/atomisp/i2c/gc2235.h | 2 ++ drivers/staging/media/atomisp/i2c/ov2722.h | 2 ++ drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 2 ++ 3 files changed, 6 insertions(+)drivers/staging/media/atomisp/i2c/gc2235.h +0
-0drivers/staging/media/atomisp/i2c/gc2235.h static struct gc2235_resolution gc2235_res_preview[] = { · line 577
Quoted 4 lines
drivers/staging/media/atomisp/i2c/gc2235.h +1
-0@@ -574,6 +574,7 @@ static struct gc2235_resolution gc2235_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(gc2235_res_preview)) +#if 0 /* Disable non-previes configurations for now */ typo (here and other cut-and-paste paces)
non-previes -> non-previewsalso, please add a FIXME: or HACK: and describe the need for a fix on atomisp TODO file.
Quoted 44 lines
drivers/staging/media/atomisp/i2c/gc2235.h +1
-0static struct gc2235_resolution gc2235_res_still[] = { { .desc ="gc2235_1600_900_30fps" ,@@ -658,6 +659,7 @@ static struct gc2235_resolution gc2235_res_video[] = { };#define N_RES_VIDEO (ARRAY_SIZE(gc2235_res_video)) +#endif static struct gc2235_resolution *gc2235_res = gc2235_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;drivers/staging/media/atomisp/i2c/ov2722.h +2
-0@@ -1148,6 +1148,7 @@ struct ov2722_resolution ov2722_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(ov2722_res_preview)) +#if 0 /* Disable non-previes configurations for now */ struct ov2722_resolution ov2722_res_still[] = { { .desc = "ov2722_480P_30fps",@@ -1250,6 +1251,7 @@ struct ov2722_resolution ov2722_res_video[] = { }, };#define N_RES_VIDEO (ARRAY_SIZE(ov2722_res_video)) +#endif static struct ov2722_resolution *ov2722_res = ov2722_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;drivers/staging/media/atomisp/i2c/ov5693/ov5693.h +1
-0@@ -1147,6 +1147,7 @@ struct ov5693_resolution ov5693_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(ov5693_res_preview)) +#if 0 /* Disable non-previes configurations for now */ struct ov5693_resolution ov5693_res_still[] = { { .desc = "ov5693_736x496_30fps",drivers/staging/media/atomisp/i2c/ov5693/ov5693.h struct ov5693_resolution ov5693_res_video[] = { · line 1371
Quoted 7 lines
drivers/staging/media/atomisp/i2c/ov5693/ov5693.h +1
-0@@ -1364,6 +1365,7 @@ struct ov5693_resolution ov5693_res_video[] = { }, };#define N_RES_VIDEO (ARRAY_SIZE(ov5693_res_video)) +#endif static struct ov5693_resolution *ov5693_res = ov5693_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;Thanks,
Mauro
Signature · 2 lines
Sakari Ailus e-mail: [email protected]
Re: [PATCHv2 4/9] staging: atomisp: i2c: Disable non-preview configurations
Em Fri, 16 Feb 2018 12:12:20 +0200
Sakari Ailus <[email protected]> escreveu:
Quoted 27 lines
Hi Mauro,
Quoted 24 lines · Mauro Carvalho Chehab
Em Mon, 22 Jan 2018 13:31:20 +0100
Hans Verkuil <[email protected]> escreveu:Quoted 4 lines
From: Sakari Ailus <[email protected]>
Disable configurations for non-preview modes until configuration selection is improved.
Again, a poor description. It just repeats the subject. A good subject/description should answer 3 questions:
what?
why?
how?Anyway, looking at this patch's contents, it partially answers my questions:
the previous patch do cause regressions at the code.
Ok, this is staging. So, we don't have very strict rules here, but still causing regressions without providing a very good reason why sucks.
Quoted 6 lines
Quoted 2 lines
I would also merge this with the previous one, in order to place all regressions on a single patch.
It's trivial to bring back the configurations disabled here by just reverting this patch. The other patch does not disable any. That's why they're separate.
Yes, and I'm not saying otherwise.
The main issue here is that it lacks a description (as what's there is just a copy of the subject).
Why is it needed to "disable non-preview configurations"?
Also, as you're actually commenting the code with #if 0, I'm assuming that you're thinking on re-enable the code (or re-implement with a different logic) in the future.
So, please add a note before the #if 0, as otherwise I'm pretty sure someone will end by sending us patches just stripping it.
Regards,
Mauro
Sakari Ailus
maintainerRe: [PATCHv2 4/9] staging: atomisp: i2c: Disable non-preview configurations
Hi Mauro,
Quoted 39 lines · Mauro Carvalho Chehab
Em Fri, 16 Feb 2018 12:12:20 +0200
Sakari Ailus <[email protected]> escreveu:Quoted 27 lines
Hi Mauro,
Quoted 24 lines · Mauro Carvalho Chehab
Em Mon, 22 Jan 2018 13:31:20 +0100
Hans Verkuil <[email protected]> escreveu:Quoted 4 lines
From: Sakari Ailus <[email protected]>
Disable configurations for non-preview modes until configuration selection is improved.
Again, a poor description. It just repeats the subject. A good subject/description should answer 3 questions:
what?
why?
how?Anyway, looking at this patch's contents, it partially answers my questions:
the previous patch do cause regressions at the code.
Ok, this is staging. So, we don't have very strict rules here, but still causing regressions without providing a very good reason why sucks.
Quoted 6 lines
Quoted 2 lines
I would also merge this with the previous one, in order to place all regressions on a single patch.
It's trivial to bring back the configurations disabled here by just reverting this patch. The other patch does not disable any. That's why they're separate.
Yes, and I'm not saying otherwise.
Quoted 8 lines
The main issue here is that it lacks a description (as what's there is just a copy of the subject).
Why is it needed to "disable non-preview configurations"?
Also, as you're actually commenting the code with #if 0, I'm assuming that you're thinking on re-enable the code (or re-implement with a different logic) in the future.
Yes, that's the intention. This being atomisp, I don't want to invest a lot of time on this until we know the driver has a future in the kernel.
Quoted 3 lines
So, please add a note before the #if 0, as otherwise I'm pretty sure someone will end by sending us patches just stripping it.
Good point. I'll respin the patch, with updated commit description and a comment there.
Signature · 4 lines
Regards, Sakari Ailus [email protected]
Sakari Ailus
maintainerPATCH 4/9 staging: atomisp: i2c: Disable non-preview configurations
In reply to Hans VerkuilThese sensor drivers have use case specific mode lists. There's no need for this nor there is a standard API for selecting the mode list. Disable configurations for non-preview modes until configuration selection is improved so that all the configurations are always usable.
---
Hi Mauro and Hans,
Would you like this one better?
drivers/staging/media/atomisp/i2c/gc2235.h | 6 ++++++ drivers/staging/media/atomisp/i2c/ov2722.h | 6 ++++++ drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 6 ++++++ 3 files changed, 18 insertions(+)
drivers/staging/media/atomisp/i2c/gc2235.h +6 -0
@@ -574,6 +574,11 @@ static struct gc2235_resolution gc2235_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(gc2235_res_preview)) +/* +* Disable non-preview configurations until the configuration selection is +* improved. +*/ +#if 0 static struct gc2235_resolution gc2235_res_still[] = { { .desc = "gc2235_1600_900_30fps",
@@ -658,6 +663,7 @@ static struct gc2235_resolution gc2235_res_video[] = { };#define N_RES_VIDEO (ARRAY_SIZE(gc2235_res_video)) +#endif static struct gc2235_resolution *gc2235_res = gc2235_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;
drivers/staging/media/atomisp/i2c/ov2722.h +6 -0
@@ -1148,6 +1148,11 @@ struct ov2722_resolution ov2722_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(ov2722_res_preview)) +/* +* Disable non-preview configurations until the configuration selection is +* improved. +*/ +#if 0 struct ov2722_resolution ov2722_res_still[] = { { .desc = "ov2722_480P_30fps",
@@ -1250,6 +1255,7 @@ struct ov2722_resolution ov2722_res_video[] = { }, };#define N_RES_VIDEO (ARRAY_SIZE(ov2722_res_video)) +#endif static struct ov2722_resolution *ov2722_res = ov2722_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;
drivers/staging/media/atomisp/i2c/ov5693/ov5693.h +6 -0
@@ -1147,6 +1147,11 @@ struct ov5693_resolution ov5693_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(ov5693_res_preview)) +/* +* Disable non-preview configurations until the configuration selection is +* improved. +*/ +#if 0 struct ov5693_resolution ov5693_res_still[] = { { .desc = "ov5693_736x496_30fps",
@@ -1364,6 +1369,7 @@ struct ov5693_resolution ov5693_res_video[] = { }, };#define N_RES_VIDEO (ARRAY_SIZE(ov5693_res_video)) +#endif static struct ov5693_resolution *ov5693_res = ov5693_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;
Signature · 1 line
2.11.0
Re: [PATCH v2.1 4/9] staging: atomisp: i2c: Disable non-preview configurations
Quoted 4 lines · Sakari Ailus
These sensor drivers have use case specific mode lists. There's no need for this nor there is a standard API for selecting the mode list. Disable configurations for non-preview modes until configuration selection is improved so that all the configurations are always usable.
It's a bit confusing. This seems contradictory: if there is no need for it, then it can be removed. Or there is a need for it, but we don't have a standard API to do it. You can't have both, can you?
Or did you mean that this functionality is currently unused, and that if we wanted to use it, we first need a new API? That would actually make sense.
Regards,
Hans
Quoted 85 lines
Signed-off-by Sakari Ailus <[email protected]>---
Hi Mauro and Hans,Would you like this one better?
drivers/staging/media/atomisp/i2c/gc2235.h | 6 ++++++ drivers/staging/media/atomisp/i2c/ov2722.h | 6 ++++++ drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 6 ++++++ 3 files changed, 18 insertions(+)drivers/staging/media/atomisp/i2c/gc2235.h +6
-0@@ -574,6 +574,11 @@ static struct gc2235_resolution gc2235_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(gc2235_res_preview)) +/* +* Disable non-preview configurations until the configuration selection is +* improved. +*/ +#if 0 static struct gc2235_resolution gc2235_res_still[] = { { .desc = "gc2235_1600_900_30fps",@@ -658,6 +663,7 @@ static struct gc2235_resolution gc2235_res_video[] = { };#define N_RES_VIDEO (ARRAY_SIZE(gc2235_res_video)) +#endif static struct gc2235_resolution *gc2235_res = gc2235_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;drivers/staging/media/atomisp/i2c/ov2722.h +6
-0@@ -1148,6 +1148,11 @@ struct ov2722_resolution ov2722_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(ov2722_res_preview)) +/* +* Disable non-preview configurations until the configuration selection is +* improved. +*/ +#if 0 struct ov2722_resolution ov2722_res_still[] = { { .desc = "ov2722_480P_30fps",@@ -1250,6 +1255,7 @@ struct ov2722_resolution ov2722_res_video[] = { }, };#define N_RES_VIDEO (ARRAY_SIZE(ov2722_res_video)) +#endif static struct ov2722_resolution *ov2722_res = ov2722_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;drivers/staging/media/atomisp/i2c/ov5693/ov5693.h +6
-0@@ -1147,6 +1147,11 @@ struct ov5693_resolution ov5693_res_preview[] = { };#define N_RES_PREVIEW (ARRAY_SIZE(ov5693_res_preview)) +/* +* Disable non-preview configurations until the configuration selection is +* improved. +*/ +#if 0 struct ov5693_resolution ov5693_res_still[] = { { .desc = "ov5693_736x496_30fps",@@ -1364,6 +1369,7 @@ struct ov5693_resolution ov5693_res_video[] = { }, };#define N_RES_VIDEO (ARRAY_SIZE(ov5693_res_video)) +#endif static struct ov5693_resolution *ov5693_res = ov5693_res_preview;static unsigned long N_RES =N_RES_PREVIEW ;
Sakari Ailus
maintainerRe: [PATCH v2.1 4/9] staging: atomisp: i2c: Disable non-preview configurations
Hi Hans,
Quoted 6 lines · Hans Verkuil
Quoted 4 lines · Sakari Ailus
These sensor drivers have use case specific mode lists. There's no need for this nor there is a standard API for selecting the mode list. Disable configurations for non-preview modes until configuration selection is improved so that all the configurations are always usable.
Quoted 6 lines
It's a bit confusing. This seems contradictory: if there is no need for it, then it can be removed. Or there is a need for it, but we don't have a standard API to do it. You can't have both, can you?
Or did you mean that this functionality is currently unused, and that if we wanted to use it, we first need a new API? That would actually make sense.
Correct. All it takes might be just to put these modes to the common list. But I can't test that as I have no hardware. It's easy to implement that later on though, that's the idea.
Signature · 2 lines
Sakari Ailus [email protected]
Re: [PATCH v2.1 4/9] staging: atomisp: i2c: Disable non-preview configurations
Quoted 13 lines · Sakari Ailus
Hi Hans,
Quoted 10 lines · Hans Verkuil
Quoted 4 lines · Sakari Ailus
These sensor drivers have use case specific mode lists. There's no need for this nor there is a standard API for selecting the mode list. Disable configurations for non-preview modes until configuration selection is improved so that all the configurations are always usable.
It's a bit confusing. This seems contradictory: if there is no need for it, then it can be removed. Or there is a need for it, but we don't have a standard API to do it. You can't have both, can you?
Quoted 7 lines
Quoted 2 lines
Or did you mean that this functionality is currently unused, and that if we wanted to use it, we first need a new API? That would actually make sense.
Correct. All it takes might be just to put these modes to the common list. But I can't test that as I have no hardware. It's easy to implement that later on though, that's the idea.
I've reworded the second sentence slightly:
"These sensor drivers have use case specific mode lists. This is currently not used nor there is a standard API for selecting the mode list. Disable configurations for non-preview modes until configuration selection is improved so that all the configurations are always usable."
Is that OK?
Regards,
Hans
Sakari Ailus
maintainerRe: [PATCH v2.1 4/9] staging: atomisp: i2c: Disable non-preview configurations
Quoted 22 lines · Hans Verkuil
Quoted 13 lines · Sakari Ailus
Hi Hans,
Quoted 10 lines · Hans Verkuil
Quoted 4 lines · Sakari Ailus
These sensor drivers have use case specific mode lists. There's no need for this nor there is a standard API for selecting the mode list. Disable configurations for non-preview modes until configuration selection is improved so that all the configurations are always usable.
It's a bit confusing. This seems contradictory: if there is no need for it, then it can be removed. Or there is a need for it, but we don't have a standard API to do it. You can't have both, can you?
Quoted 7 lines
Quoted 2 lines
Or did you mean that this functionality is currently unused, and that if we wanted to use it, we first need a new API? That would actually make sense.
Correct. All it takes might be just to put these modes to the common list. But I can't test that as I have no hardware. It's easy to implement that later on though, that's the idea.
Quoted 8 lines
I've reworded the second sentence slightly:
"These sensor drivers have use case specific mode lists. This is currently not used nor there is a standard API for selecting the mode list. Disable configurations for non-preview modes until configuration selection is improved so that all the configurations are always usable."
Is that OK?
Works for me. Thanks!
Signature · 2 lines
Sakari Ailus [email protected]
PATCH v2 5/9 staging: atomisp: i2c: Drop g_parm support in sensor drivers
In reply to Hans VerkuilFrom: Sakari Ailus <[email protected]>
These drivers already support g_frame_interval. Therefore just dropping g_parm is enough.
--- drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 27 ---------------------- drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 27 ---------------------- drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 27 ---------------------- drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 27 ---------------------- .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 27 ---------------------- 5 files changed, 135 deletions(-)
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c +0 -27
@@ -1204,32 +1204,6 @@ static int gc0310_s_config(struct v4l2_subdev *sd,return ret; } -static int gc0310_g_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct gc0310_device *dev =to_gc0310_sensor (sd); -struct i2c_client *client =v4l2_get_subdevdata (sd); - -if (!param) -return -EINVAL ; - -if (param->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) { -dev_err (&client->dev,"unsupported buffer type.\n" ); -return -EINVAL ; - } - -memset (param,0 ,sizeof (*param)); - param->type =V4L2_BUF_TYPE_VIDEO_CAPTURE ; - -if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { - param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; - param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.timeperframe.denominator = - gc0310_res[dev->fmt_idx].fps; - } -return 0 ; -} -static int gc0310_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {
@@ -1288,7 +1262,6 @@ static const struct v4l2_subdev_sensor_ops gc0310_sensor_ops = {static const struct v4l2_subdev_video_ops gc0310_video_ops = { .s_stream = gc0310_s_stream, - .g_parm = gc0310_g_parm, .g_frame_interval = gc0310_g_frame_interval, };
drivers/staging/media/atomisp/i2c/atomisp-gc2235.c +0 -27
@@ -944,32 +944,6 @@ static int gc2235_s_config(struct v4l2_subdev *sd,return ret; } -static int gc2235_g_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct gc2235_device *dev =to_gc2235_sensor (sd); -struct i2c_client *client =v4l2_get_subdevdata (sd); - -if (!param) -return -EINVAL ; - -if (param->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) { -dev_err (&client->dev,"unsupported buffer type.\n" ); -return -EINVAL ; - } - -memset (param,0 ,sizeof (*param)); - param->type =V4L2_BUF_TYPE_VIDEO_CAPTURE ; - -if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { - param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; - param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.timeperframe.denominator = - gc2235_res[dev->fmt_idx].fps; - } -return 0 ; -} -static int gc2235_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {
@@ -1027,7 +1001,6 @@ static const struct v4l2_subdev_sensor_ops gc2235_sensor_ops = {static const struct v4l2_subdev_video_ops gc2235_video_ops = { .s_stream = gc2235_s_stream, - .g_parm = gc2235_g_parm, .g_frame_interval = gc2235_g_frame_interval, };
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +0 -27
@@ -1280,32 +1280,6 @@ static int ov2680_s_config(struct v4l2_subdev *sd,return ret; } -static int ov2680_g_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct ov2680_device *dev =to_ov2680_sensor (sd); -struct i2c_client *client =v4l2_get_subdevdata (sd); - -if (!param) -return -EINVAL ; - -if (param->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) { -dev_err (&client->dev,"unsupported buffer type.\n" ); -return -EINVAL ; - } - -memset (param,0 ,sizeof (*param)); - param->type =V4L2_BUF_TYPE_VIDEO_CAPTURE ; - -if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { - param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; - param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.timeperframe.denominator = - ov2680_res[dev->fmt_idx].fps; - } -return 0 ; -} -static int ov2680_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {
@@ -1359,7 +1333,6 @@ static int ov2680_g_skip_frames(struct v4l2_subdev *sd, u32 *frames)static const struct v4l2_subdev_video_ops ov2680_video_ops = { .s_stream = ov2680_s_stream, - .g_parm = ov2680_g_parm, .g_frame_interval = ov2680_g_frame_interval, };
drivers/staging/media/atomisp/i2c/atomisp-ov2722.c +0 -27
@@ -1083,32 +1083,6 @@ static int ov2722_s_config(struct v4l2_subdev *sd,return ret; } -static int ov2722_g_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct ov2722_device *dev =to_ov2722_sensor (sd); -struct i2c_client *client =v4l2_get_subdevdata (sd); - -if (!param) -return -EINVAL ; - -if (param->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) { -dev_err (&client->dev,"unsupported buffer type.\n" ); -return -EINVAL ; - } - -memset (param,0 ,sizeof (*param)); - param->type =V4L2_BUF_TYPE_VIDEO_CAPTURE ; - -if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { - param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; - param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.timeperframe.denominator = - ov2722_res[dev->fmt_idx].fps; - } -return 0 ; -} -static int ov2722_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {
@@ -1167,7 +1141,6 @@ static const struct v4l2_subdev_sensor_ops ov2722_sensor_ops = {static const struct v4l2_subdev_video_ops ov2722_video_ops = { .s_stream = ov2722_s_stream, - .g_parm = ov2722_g_parm, .g_frame_interval = ov2722_g_frame_interval, };
drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c +0 -27
@@ -1805,32 +1805,6 @@ static int ov5693_s_config(struct v4l2_subdev *sd,return ret; } -static int ov5693_g_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -struct ov5693_device *dev =to_ov5693_sensor (sd); -struct i2c_client *client =v4l2_get_subdevdata (sd); - -if (!param) -return -EINVAL ; - -if (param->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) { -dev_err (&client->dev,"unsupported buffer type.\n" ); -return -EINVAL ; - } - -memset (param,0 ,sizeof (*param)); - param->type =V4L2_BUF_TYPE_VIDEO_CAPTURE ; - -if (dev->fmt_idx >=0 && dev->fmt_idx <N_RES ) { - param->parm.capture.capability =V4L2_CAP_TIMEPERFRAME ; - param->parm.capture.timeperframe.numerator =1 ; - param->parm.capture.timeperframe.denominator = - ov5693_res[dev->fmt_idx].fps; - } -return 0 ; -} -static int ov5693_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval) {
@@ -1873,7 +1847,6 @@ static int ov5693_enum_frame_size(struct v4l2_subdev *sd,static const struct v4l2_subdev_video_ops ov5693_video_ops = { .s_stream = ov5693_s_stream, - .g_parm = ov5693_g_parm, .g_frame_interval = ov5693_g_frame_interval, };
Signature · 1 line
2.15.1
PATCH v2 6/9 staging: atomisp: mt9m114: Drop empty s_parm callback
In reply to Hans VerkuilFrom: Sakari Ailus <[email protected]>
The s_parm callback in mt9m114 driver did nothing, remove it.
--- drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c +0 -6
@@ -1684,11 +1684,6 @@ static int mt9m114_t_vflip(struct v4l2_subdev *sd, int value)return !!err; } -static int mt9m114_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -return 0 ; -}static int mt9m114_g_frame_interval (struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval)
@@ -1781,7 +1776,6 @@ static int mt9m114_g_skip_frames(struct v4l2_subdev *sd, u32 *frames) }static const struct v4l2_subdev_video_ops mt9m114_video_ops = { - .s_parm = mt9m114_s_parm, .s_stream = mt9m114_s_stream, .g_frame_interval = mt9m114_g_frame_interval, };
Signature · 1 line
2.15.1
PATCH v2 7/9 staging: atomisp: Drop g_parm and s_parm subdev ops use
In reply to Hans VerkuilFrom: Sakari Ailus <[email protected]>
The s_parm and g_parm did nothing. Remove them.
--- .../staging/media/atomisp/pci/atomisp2/atomisp_file.c | 16 ---------------- drivers/staging/media/atomisp/pci/atomisp2/atomisp_tpg.c | 14 -------------- 2 files changed, 30 deletions(-)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_file.c +0 -16
@@ -77,20 +77,6 @@ static int file_input_s_stream(struct v4l2_subdev *sd, int enable)return 0 ; } -static int file_input_g_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -/*to fake*/ -return 0 ; -} - -static int file_input_s_parm (struct v4l2_subdev *sd, -struct v4l2_streamparm *param) -{ -/*to fake*/ -return 0 ; -} -static int file_input_get_fmt (struct v4l2_subdev *sd,struct v4l2_subdev_pad_config *cfg,struct v4l2_subdev_format *format)
@@ -166,8 +152,6 @@ static int file_input_enum_frame_ival(struct v4l2_subdev *sd,static const struct v4l2_subdev_video_ops file_input_video_ops = { .s_stream = file_input_s_stream, - .g_parm = file_input_g_parm, - .s_parm = file_input_s_parm, };static const struct v4l2_subdev_core_ops file_input_core_ops = {
drivers/staging/media/atomisp/pci/atomisp2/atomisp_tpg.c +0 -14
@@ -27,18 +27,6 @@ static int tpg_s_stream(struct v4l2_subdev *sd, int enable)return 0 ; } -static int tpg_g_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *param) -{ -/*to fake*/ -return 0 ; -} - -static int tpg_s_parm (struct v4l2_subdev *sd,struct v4l2_streamparm *param) -{ -/*to fake*/ -return 0 ; -} -static int tpg_get_fmt (struct v4l2_subdev *sd,struct v4l2_subdev_pad_config *cfg,struct v4l2_subdev_format *format)
@@ -101,8 +89,6 @@ static int tpg_enum_frame_ival(struct v4l2_subdev *sd,static const struct v4l2_subdev_video_ops tpg_video_ops = { .s_stream = tpg_s_stream, - .g_parm = tpg_g_parm, - .s_parm = tpg_s_parm, };static const struct v4l2_subdev_core_ops tpg_core_ops = {
Signature · 1 line
2.15.1
PATCH v2 8/9 v4l2-subdev.h: remove obsolete g/s_parm
In reply to Hans VerkuilFrom: Hans Verkuil <[email protected]>
--- include/media/v4l2-subdev.h | 6 ------ 1 file changed, 6 deletions(-)
include/media/v4l2-subdev.h +0 -6
@@ -393,10 +393,6 @@ struct v4l2_mbus_frame_desc {* * @g_pixelaspect: callback to return the pixelaspect ratio. * -* @g_parm: callback for VIDIOC_G_PARM() ioctl handler code. -* -* @s_parm: callback for VIDIOC_S_PARM() ioctl handler code. -* * @g_frame_interval: callback for VIDIOC_SUBDEV_G_FRAME_INTERVAL() * ioctl handler code. *
@@ -434,8 +430,6 @@ struct v4l2_subdev_video_ops {int (*g_input_status)(struct v4l2_subdev *sd,u32 *status);int (*s_stream)(struct v4l2_subdev *sd,int enable);int (*g_pixelaspect)(struct v4l2_subdev *sd,struct v4l2_fract *aspect); -int (*g_parm)(struct v4l2_subdev *sd,struct v4l2_streamparm *param); -int (*s_parm)(struct v4l2_subdev *sd,struct v4l2_streamparm *param);int (*g_frame_interval)(struct v4l2_subdev *sd,struct v4l2_subdev_frame_interval *interval); int (*s_frame_interval)(struct v4l2_subdev *sd,
Signature · 1 line
2.15.1
PATCH v2 9/9 vidioc-g-parm.rst: also allow _MPLANE buffer types
In reply to Hans VerkuilFrom: Hans Verkuil <[email protected]>
The specification mentions that type can be V4L2_BUF_TYPE_VIDEO_CAPTURE, but the v4l2 core implementation also allows the _MPLANE variant.
Document this.
--- Documentation/media/uapi/v4l/vidioc-g-parm.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
Documentation/media/uapi/v4l/vidioc-g-parm.rst +4 -3
@@ -66,7 +66,7 @@ union holding separate parameters for input and output devices. - - The buffer (stream) type, same as struct :c:type:`v4l2_format` ``type``, set by the - application. See :c:type:`v4l2_buf_type` + application. See :c:type:`v4l2_buf_type`. * - union - ``parm`` -
@@ -75,12 +75,13 @@ union holding separate parameters for input and output devices. - struct :c:type:`v4l2_captureparm` - ``capture`` - Parameters for capture devices, used when ``type`` is - ``V4L2_BUF_TYPE_VIDEO_CAPTURE``. + ``V4L2_BUF_TYPE_VIDEO_CAPTURE`` or + ``V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE``. * - - struct :c:type:`v4l2_outputparm` - ``output`` - Parameters for output devices, used when ``type`` is - ``V4L2_BUF_TYPE_VIDEO_OUTPUT``. + ``V4L2_BUF_TYPE_VIDEO_OUTPUT`` or ``V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE``. * - - __u8 - ``raw_data``\ [200]
Signature · 1 line
2.15.1
Hi Hans,
Quoted 23 lines · Hans Verkuil
From: Hans Verkuil <[email protected]>
There are currently two subdev ops variants to get/set the frame interval:
g/s_parm and g/s_frame_interval.This patch series replaces all g/s_parm calls by g/s_frame_interval.
The first patch adds helper functions that can be used by bridge drivers. Only em28xx can't use it and it needs custom code (it uses
v4l2_device_call()to try all subdevs instead of calling a specific subdev).The next patch converts all non-staging drivers, then come Sakari's atomisp staging fixes.
The
v4l2-subdev.hpatch removes the now obsolete g/s_parm ops and the final patch clarifies the documentation a bit (the core allows for_MPLANEto be used as well).I would really like to take the next step and introduce two new ioctls VIDIOC_G/S_FRAME_INTERVAL (just like the SUBDEV variants that already exist) and convert all bridge drivers to use that and just have helper functions in the core for VIDIOC_G/S_PARM.
Quoted 4 lines
I hate that ioctl and it always confuses driver developers. It would also prevent the type of abuse that was present in the atomisp driver.
But that's for later, let's simplify the subdev drivers first.
Apart from my patches,
Signature · 2 lines
Sakari Ailus [email protected]