| Message ID | 20220503093925.876640-1-xavier.roumegue@oss.nxp.com |
|---|---|
| Headers | show |
| Series | i.MX8MP DW100 dewarper driver | expand |
Hi Xavier and Hans, Thank you for the patch. On Tue, May 03, 2022 at 11:39:17AM +0200, Xavier Roumegue wrote: > From: Hans Verkuil <hverkuil-cisco@xs4all.nl> > > Add a new flag that indicates that this control is a dynamically sized > array. Also document this flag. > > Currently dynamically sized arrays are limited to one dimensional arrays, > but that might change in the future if there is a need for it. > > The initial use-case of dynamic arrays are stateless codecs. A frame > can be divided in many slices, so you want to provide an array containing > slice information for each slice. Typically the number of slices is small, > but the standard allow for hundreds or thousands of slices. Dynamic arrays > are a good solution since sizing the array for the worst case would waste > substantial amounts of memory. > > Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> > --- > .../userspace-api/media/v4l/vidioc-queryctrl.rst | 8 ++++++++ > include/uapi/linux/videodev2.h | 1 + > 2 files changed, 9 insertions(+) > > diff --git a/Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst b/Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst > index 88f630252d98..a20dfa2a933b 100644 > --- a/Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst > +++ b/Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst > @@ -625,6 +625,14 @@ See also the examples in :ref:`control`. > ``V4L2_CTRL_FLAG_GRABBED`` flag when buffers are allocated or > streaming is in progress since most drivers do not support changing > the format in that case. > + * - ``V4L2_CTRL_FLAG_DYNAMIC_ARRAY`` > + - 0x0800 > + - This control is a dynamically sized 1-dimensional array. It > + behaves the same as a regular array, except that the number > + of elements as reported by the ``elems`` field is between 1 and > + ``dims[0]``. So setting the control with a differently sized > + array will change the ``elems`` field when the control is > + queried afterwards. Wrong indentation. Can the dimension be changed by the application only, or by the driver too ? In the latter case, is an event generated ? Considering this in the context of this series, the driver needs to change the dimension, as the use case is to size the control based on the image size. Do we want to document here that the driver will reset the control to a default value when the dimension changes, or is that something that should be control-specific ? > > Return Value > ============ > diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h > index 3768a0a80830..8df13defde75 100644 > --- a/include/uapi/linux/videodev2.h > +++ b/include/uapi/linux/videodev2.h > @@ -1886,6 +1886,7 @@ struct v4l2_querymenu { > #define V4L2_CTRL_FLAG_HAS_PAYLOAD 0x0100 > #define V4L2_CTRL_FLAG_EXECUTE_ON_WRITE 0x0200 > #define V4L2_CTRL_FLAG_MODIFY_LAYOUT 0x0400 > +#define V4L2_CTRL_FLAG_DYNAMIC_ARRAY 0x0800 > > /* Query flags, to be ORed with the control ID */ > #define V4L2_CTRL_FLAG_NEXT_CTRL 0x80000000
Hi Hans, On 6/15/22 11:14, Hans Verkuil wrote: > Hi Laurent, Xavier, > > Ignore what I wrote before, I read it with the HEVC patch series in mind, not the dw100 > series. > > So let me try again :-) > > On 6/14/22 23:00, Laurent Pinchart wrote: >> Hi Xavier and Hans, >> >> Thank you for the patch. >> >> On Tue, May 03, 2022 at 11:39:19AM +0200, Xavier Roumegue wrote: >>> From: Hans Verkuil <hverkuil-cisco@xs4all.nl> >>> >>> Add a dynamic array test control to help test support for this >>> feature. >>> >>> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> >>> --- >>> drivers/media/test-drivers/vivid/vivid-ctrls.c | 15 +++++++++++++++ >>> 1 file changed, 15 insertions(+) >>> >>> diff --git a/drivers/media/test-drivers/vivid/vivid-ctrls.c b/drivers/media/test-drivers/vivid/vivid-ctrls.c >>> index e7516dc1227b..7267892dc18a 100644 >>> --- a/drivers/media/test-drivers/vivid/vivid-ctrls.c >>> +++ b/drivers/media/test-drivers/vivid/vivid-ctrls.c >>> @@ -34,6 +34,7 @@ >>> #define VIVID_CID_U8_4D_ARRAY (VIVID_CID_CUSTOM_BASE + 10) >>> #define VIVID_CID_AREA (VIVID_CID_CUSTOM_BASE + 11) >>> #define VIVID_CID_RO_INTEGER (VIVID_CID_CUSTOM_BASE + 12) >>> +#define VIVID_CID_U32_DYN_ARRAY (VIVID_CID_CUSTOM_BASE + 13) >>> >>> #define VIVID_CID_VIVID_BASE (0x00f00000 | 0xf000) >>> #define VIVID_CID_VIVID_CLASS (0x00f00000 | 1) >>> @@ -189,6 +190,19 @@ static const struct v4l2_ctrl_config vivid_ctrl_u32_array = { >>> .dims = { 1 }, >>> }; >>> >>> +static const struct v4l2_ctrl_config vivid_ctrl_u32_dyn_array = { >>> + .ops = &vivid_user_gen_ctrl_ops, >>> + .id = VIVID_CID_U32_DYN_ARRAY, >>> + .name = "U32 Dynamic Array", >>> + .type = V4L2_CTRL_TYPE_U32, >>> + .flags = V4L2_CTRL_FLAG_DYNAMIC_ARRAY, >>> + .def = 50, >>> + .min = 10, >>> + .max = 90, >>> + .step = 1, >>> + .dims = { 100 }, >>> +}; >> >> To meaningfully test this, don't we need the vivid driver to change the >> dimension ? Or is it meant to only test changes made by the application >> ? > > As I understand it the dw100 driver needs a 2 dimensional array control. Considering the semantic of the array control, indeed, this is 2 dimensional array control. Nevertheless, the driver does not need to access individual array items, as the hardware is the only consumer. Hence, the driver rather considers the array control as a binary blob with varying size. From this perspective, the dynamic array control was a good candidate. > The size is fixed for each resolution, but if the resolution changes, then > this control changes size as well, and it makes sense that when that happens > it is also reset to default values. > > So this isn't a dynamic array at all. It is a standard 2 dimensional array. > > What is missing in the control framework is a function similar to > v4l2_ctrl_modify_range() that can resize an array. > > v4l2_ctrl_modify_dimensions() would be a goo > I can make something for that if you both agree with this proposal. I am ok with that. Thanks ! Regards, Xavier > > Regards, > > Hans > >> >>> + >>> static const struct v4l2_ctrl_config vivid_ctrl_u16_matrix = { >>> .ops = &vivid_user_gen_ctrl_ops, >>> .id = VIVID_CID_U16_MATRIX, >>> @@ -1612,6 +1626,7 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap, >>> dev->ro_int32 = v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_ro_int32, NULL); >>> v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_area, NULL); >>> v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_u32_array, NULL); >>> + v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_u32_dyn_array, NULL); >>> v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_u16_matrix, NULL); >>> v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_u8_4d_array, NULL); >>> >>
This patchset depends on the series "consolidated i.MX8MP HSIO/MEDIA/HDMI blk-ctrl series"[1] and "i.MX8MP GPC and blk-ctrl"[2] which provide the power driver infrastructure and associated dt-bindings. Previous series can now be marked as superseded. v1: https://patchwork.linuxtv.org/project/linux-media/list/?series=7443 v2: https://patchwork.linuxtv.org/project/linux-media/list/?series=7472 v3: https://patchwork.linuxtv.org/project/linux-media/list/?series=7473 v4: https://patchwork.linuxtv.org/project/linux-media/list/?series=7633 Patches [1-3/9] add support for dynamic array control imported from the "Move HEVC stateless controls out of staging"[3] currently under review. Patches [4-7/9] document the driver interfaces, and export its v4l2 custom control to uapi headers. Patches [8/9] adds the v4l2 m2m driver. Patches [9/9] adds the driver to MAINTAINERS. The patchset baseline is v5.18-rc4. The Vivante DW100 Dewarp Engine, found on i.MX8MP SoC, provides high-performance dewarp processing for the correction of the distortion that is introduced in images produced by fisheye and wide angle lenses. The engine can be used for accelerating scaling, cropping and pixel format conversion operations independently of the dewarping feature. A script example [4] has been published to generate the dewarping blob from outgoing openCV 3d calibration process parameters. This scrict can generate identity map with h/v flip, dewarping and stereo rectification mappings. The driver has been tested with: - v4l2-ctl (from master with [6]) for testing pixel format conversion, scaling and crop features using builtin driver identity map. - OpenCV stereo application using dedicated dw100 openCV module [5] to implement stereo rectification stage. - GStreamer v4l2convert (patched to support dewarping blob map injection) - v4l2-compliance (test report added after changelog) [1] https://patchwork.kernel.org/project/linux-arm-kernel/list/?series=629586 [2] https://lore.kernel.org/all/20220330104620.3600159-1-l.stach@pengutronix.de/ [3] https://patchwork.linuxtv.org/project/linux-media/list/?series=7418 [4] https://github.com/NXPmicro/vtec-cv/tree/main/bin [5] https://github.com/NXPmicro/vtec-opencv [6] https://patchwork.linuxtv.org/project/linux-media/list/?series=7595 --- Changelog: v5: - Add enum_frame_size support - Fix checkpatch.pl --strict issues - Reword documentation and add ascii-art figures. - Strip v4l2 array controls size to 1 in driver state structure - Use strscpy instead of strncpy - Use min/max macro from minmax.h - Use kernel DIV_ROUND helpers. - s/0x[A-F]/0x[a-f]/ v4: - Move dw100 driver to NXP platform media drivers folder - Change dt compatible string to "nxp,imx8mp-dw100" - Rename V4L2_CID_DW100_MAPPING to V4L2_CID_DW100_DEWARPING_16x16_VERTEX_MAP - Add more verbose description of V4L2_CID_DW100_DEWARPING_16x16_VERTEX_MAP - Handle v4l2 controls as an array in driver. v3: - Fix incorrect i.MX8MP Reference Manual link in documentation v2: - Fix yaml dt-bindings errors - Drop assigned-clocks properties from dt-bindings example - Add dw100 driver documentation - Rework V4L2 LUT assignment with v4l2 dynamic array control - Rename V4L2_CID_DW100_LUT to V4L2_CID_DW100_MAPPING - Export V4L2_CID_DW100_MAPPING to kernel headers Hans Verkuil (3): videodev2.h: add V4L2_CTRL_FLAG_DYNAMIC_ARRAY v4l2-ctrls: add support for dynamically allocated arrays. vivid: add dynamic array test control Xavier Roumegue (6): media: Documentation: dw100: Add user documentation for the DW100 driver media: v4l: uapi: Add user control base for DW100 controls media: uapi: Add a control for DW100 driver media: dt-bindings: media: Add i.MX8MP DW100 binding media: dw100: Add i.MX8MP dw100 dewarper driver media: MAINTAINERS: add entry for i.MX8MP DW100 v4l2 mem2mem driver .../devicetree/bindings/media/nxp,dw100.yaml | 69 + .../userspace-api/media/drivers/dw100.rst | 103 + .../userspace-api/media/drivers/index.rst | 3 +- .../media/v4l/vidioc-queryctrl.rst | 8 + MAINTAINERS | 9 + drivers/media/platform/nxp/Kconfig | 1 + drivers/media/platform/nxp/Makefile | 1 + drivers/media/platform/nxp/dw100/Kconfig | 16 + drivers/media/platform/nxp/dw100/Makefile | 3 + drivers/media/platform/nxp/dw100/dw100.c | 1782 +++++++++++++++++ drivers/media/platform/nxp/dw100/dw100_regs.h | 118 ++ .../media/test-drivers/vivid/vivid-ctrls.c | 15 + drivers/media/v4l2-core/v4l2-ctrls-api.c | 103 +- drivers/media/v4l2-core/v4l2-ctrls-core.c | 182 +- drivers/media/v4l2-core/v4l2-ctrls-priv.h | 3 +- drivers/media/v4l2-core/v4l2-ctrls-request.c | 13 +- include/media/v4l2-ctrls.h | 42 +- include/uapi/linux/dw100.h | 14 + include/uapi/linux/v4l2-controls.h | 6 + include/uapi/linux/videodev2.h | 1 + 20 files changed, 2420 insertions(+), 72 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/nxp,dw100.yaml create mode 100644 Documentation/userspace-api/media/drivers/dw100.rst create mode 100644 drivers/media/platform/nxp/dw100/Kconfig create mode 100644 drivers/media/platform/nxp/dw100/Makefile create mode 100644 drivers/media/platform/nxp/dw100/dw100.c create mode 100644 drivers/media/platform/nxp/dw100/dw100_regs.h create mode 100644 include/uapi/linux/dw100.h ========== Compliance ========== # v4l2-compliance -d 1 v4l2-compliance 1.23.0-4923, 64 bits, 64-bit time_t v4l2-compliance SHA: 163144712a46 2022-04-25 05:31:44 Compliance test for dw100 device /dev/video1: Driver Info: Driver name : dw100 Card type : DW100 dewarper Bus info : platform:dw100 Driver version : 5.18.0 Capabilities : 0x84208000 Video Memory-to-Memory Streaming Extended Pix Format Device Capabilities Device Caps : 0x04208000 Video Memory-to-Memory Streaming Extended Pix Format Media Driver Info: Driver name : dw100 Model : dw100 Serial : Bus info : platform:dw100 Media version : 5.18.0 Hardware revision: 0x00000000 (0) Driver version : 5.18.0 Interface Info: ID : 0x0300000c Type : V4L Video Entity Info: ID : 0x00000001 (1) Name : dw100-source Function : V4L2 I/O Pad 0x01000002 : 0: Source Link 0x02000008: to remote pad 0x1000004 of entity 'dw100-proc' (Video Scaler): Data, Enabled, Immutable Required ioctls: test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK test invalid ioctls: OK Allow for multiple opens: test second /dev/video1 open: OK test VIDIOC_QUERYCAP: OK test VIDIOC_G/S_PRIORITY: OK test for unlimited opens: OK Debug ioctls: test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK (Not Supported) Input ioctls: test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported) test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported) Inputs: 0 Audio Inputs: 0 Tuners: 0 Output ioctls: test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported) Outputs: 0 Audio Outputs: 0 Modulators: 0 Input/Output configuration ioctls: test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported) Control ioctls: test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK test VIDIOC_QUERYCTRL: OK test VIDIOC_G/S_CTRL: OK test VIDIOC_G/S/TRY_EXT_CTRLS: OK test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 0 Private Controls: 0 Standard Compound Controls: 0 Private Compound Controls: 1 Format ioctls: test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK test VIDIOC_TRY_FMT: OK test VIDIOC_S_FMT: OK test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK test Composing: OK test Scaling: OK Codec ioctls: test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported) Buffer ioctls: test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK test Requests: OK (Not Supported) Total for dw100 device /dev/video1: 46, Succeeded: 46, Failed: 0, Warnings: 0 ================ Media controller ================ # media-ctl -p Media controller API version 5.18.0 Media device information ------------------------ driver dw100 model dw100 serial bus info platform:dw100 hw revision 0x0 driver version 5.18.0 Device topology - entity 1: dw100-source (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video1 pad0: Source -> "dw100-proc":0 [ENABLED,IMMUTABLE] - entity 3: dw100-proc (2 pads, 2 links) type Node subtype Unknown flags 0 pad0: Sink <- "dw100-source":0 [ENABLED,IMMUTABLE] pad1: Source -> "dw100-sink":0 [ENABLED,IMMUTABLE] - entity 6: dw100-sink (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video1 pad0: Sink <- "dw100-proc":1 [ENABLED,IMMUTABLE] -- 2.35.1