| Message ID | 20230929-wave5_v13_media_master-v13-0-5ac60ccbf2ce@collabora.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Wave5 codec driver | expand |
Hi Sebastian, On 12/10/2023 13:01, Sebastian Fricke wrote: > Add the decoder and encoder implementing the v4l2 > API. This patch also adds the Makefile and the VIDEO_WAVE_VPU config > > Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com> > Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> > Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com> > Signed-off-by: Robert Beckett <bob.beckett@collabora.com> > Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> > Signed-off-by: Nas Chung <nas.chung@chipsnmedia.com> > --- > drivers/media/platform/chips-media/Kconfig | 1 + > drivers/media/platform/chips-media/Makefile | 1 + > drivers/media/platform/chips-media/wave5/Kconfig | 12 + > drivers/media/platform/chips-media/wave5/Makefile | 10 + > .../platform/chips-media/wave5/wave5-helper.c | 213 +++ > .../platform/chips-media/wave5/wave5-helper.h | 31 + > .../platform/chips-media/wave5/wave5-vpu-dec.c | 1953 ++++++++++++++++++++ > .../platform/chips-media/wave5/wave5-vpu-enc.c | 1794 ++++++++++++++++++ > .../media/platform/chips-media/wave5/wave5-vpu.c | 291 +++ > .../media/platform/chips-media/wave5/wave5-vpu.h | 83 + > .../platform/chips-media/wave5/wave5-vpuapi.h | 2 - > 11 files changed, 4389 insertions(+), 2 deletions(-) > <snip> > +static int wave5_vpu_dec_create_bufs(struct file *file, void *priv, > + struct v4l2_create_buffers *create) > +{ > + struct vpu_instance *inst = wave5_to_vpu_inst(priv); > + struct v4l2_format *f = &create->format; > + > + /* Firmware does not support CREATE_BUFS for CAPTURE queues. */ > + if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { > + dev_dbg(inst->dev->dev, > + "%s: VIDIOC_CREATE_BUFS not supported on CAPTURE queues.\n", > + __func__); > + return -EOPNOTSUPP; > + } > + > + return v4l2_m2m_ioctl_create_bufs(file, priv, create); > +} Regarding the EOPNOTSUPP discussion: I discussed this some more with Nicolas on irc, and we wonder if it isn't better to just drop create_bufs support for the wave5 decoder altogether. Is there any point in supporting it for OUTPUT but not CAPTURE? <snip> > +static const struct v4l2_ioctl_ops wave5_vpu_dec_ioctl_ops = { > + .vidioc_querycap = wave5_vpu_dec_querycap, > + .vidioc_enum_framesizes = wave5_vpu_dec_enum_framesizes, > + > + .vidioc_enum_fmt_vid_cap = wave5_vpu_dec_enum_fmt_cap, > + .vidioc_s_fmt_vid_cap_mplane = wave5_vpu_dec_s_fmt_cap, > + .vidioc_g_fmt_vid_cap_mplane = wave5_vpu_dec_g_fmt_cap, > + .vidioc_try_fmt_vid_cap_mplane = wave5_vpu_dec_try_fmt_cap, > + > + .vidioc_enum_fmt_vid_out = wave5_vpu_dec_enum_fmt_out, > + .vidioc_s_fmt_vid_out_mplane = wave5_vpu_dec_s_fmt_out, > + .vidioc_g_fmt_vid_out_mplane = wave5_vpu_g_fmt_out, > + .vidioc_try_fmt_vid_out_mplane = wave5_vpu_dec_try_fmt_out, > + > + .vidioc_g_selection = wave5_vpu_dec_g_selection, > + .vidioc_s_selection = wave5_vpu_dec_s_selection, > + > + .vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs, > + .vidioc_querybuf = v4l2_m2m_ioctl_querybuf, > + .vidioc_create_bufs = wave5_vpu_dec_create_bufs, So this would just be dropped. > + .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf, > + .vidioc_qbuf = v4l2_m2m_ioctl_qbuf, > + .vidioc_expbuf = v4l2_m2m_ioctl_expbuf, > + .vidioc_dqbuf = v4l2_m2m_ioctl_dqbuf, > + .vidioc_streamon = v4l2_m2m_ioctl_streamon, > + .vidioc_streamoff = v4l2_m2m_ioctl_streamoff, > + > + .vidioc_try_decoder_cmd = v4l2_m2m_ioctl_try_decoder_cmd, > + .vidioc_decoder_cmd = wave5_vpu_dec_decoder_cmd, > + > + .vidioc_subscribe_event = wave5_vpu_subscribe_event, > + .vidioc_unsubscribe_event = v4l2_event_unsubscribe, > +}; This also means there is no need to document the new EOPNOTSUPP error code in VIDIOC_CREATE_BUFS, or to modify v4l2-compliance. You *do* need to add a comment somewhere explaining why you don't support this ioctl. I think it would be best to do that right after '.vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs,'. Regards, Hans
Hey Hans, On 16.10.2023 13:57, Hans Verkuil wrote: >Hi Sebastian, > >On 12/10/2023 13:01, Sebastian Fricke wrote: >> Add the decoder and encoder implementing the v4l2 >> API. This patch also adds the Makefile and the VIDEO_WAVE_VPU config >> >> Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com> >> Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> >> Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com> >> Signed-off-by: Robert Beckett <bob.beckett@collabora.com> >> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> >> Signed-off-by: Nas Chung <nas.chung@chipsnmedia.com> >> --- >> drivers/media/platform/chips-media/Kconfig | 1 + >> drivers/media/platform/chips-media/Makefile | 1 + >> drivers/media/platform/chips-media/wave5/Kconfig | 12 + >> drivers/media/platform/chips-media/wave5/Makefile | 10 + >> .../platform/chips-media/wave5/wave5-helper.c | 213 +++ >> .../platform/chips-media/wave5/wave5-helper.h | 31 + >> .../platform/chips-media/wave5/wave5-vpu-dec.c | 1953 ++++++++++++++++++++ >> .../platform/chips-media/wave5/wave5-vpu-enc.c | 1794 ++++++++++++++++++ >> .../media/platform/chips-media/wave5/wave5-vpu.c | 291 +++ >> .../media/platform/chips-media/wave5/wave5-vpu.h | 83 + >> .../platform/chips-media/wave5/wave5-vpuapi.h | 2 - >> 11 files changed, 4389 insertions(+), 2 deletions(-) >> > ><snip> > >> +static int wave5_vpu_dec_create_bufs(struct file *file, void *priv, >> + struct v4l2_create_buffers *create) >> +{ >> + struct vpu_instance *inst = wave5_to_vpu_inst(priv); >> + struct v4l2_format *f = &create->format; >> + >> + /* Firmware does not support CREATE_BUFS for CAPTURE queues. */ >> + if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { >> + dev_dbg(inst->dev->dev, >> + "%s: VIDIOC_CREATE_BUFS not supported on CAPTURE queues.\n", >> + __func__); >> + return -EOPNOTSUPP; >> + } >> + >> + return v4l2_m2m_ioctl_create_bufs(file, priv, create); >> +} > >Regarding the EOPNOTSUPP discussion: I discussed this some more with >Nicolas on irc, and we wonder if it isn't better to just drop create_bufs >support for the wave5 decoder altogether. Is there any point in supporting >it for OUTPUT but not CAPTURE? > ><snip> > >> +static const struct v4l2_ioctl_ops wave5_vpu_dec_ioctl_ops = { >> + .vidioc_querycap = wave5_vpu_dec_querycap, >> + .vidioc_enum_framesizes = wave5_vpu_dec_enum_framesizes, >> + >> + .vidioc_enum_fmt_vid_cap = wave5_vpu_dec_enum_fmt_cap, >> + .vidioc_s_fmt_vid_cap_mplane = wave5_vpu_dec_s_fmt_cap, >> + .vidioc_g_fmt_vid_cap_mplane = wave5_vpu_dec_g_fmt_cap, >> + .vidioc_try_fmt_vid_cap_mplane = wave5_vpu_dec_try_fmt_cap, >> + >> + .vidioc_enum_fmt_vid_out = wave5_vpu_dec_enum_fmt_out, >> + .vidioc_s_fmt_vid_out_mplane = wave5_vpu_dec_s_fmt_out, >> + .vidioc_g_fmt_vid_out_mplane = wave5_vpu_g_fmt_out, >> + .vidioc_try_fmt_vid_out_mplane = wave5_vpu_dec_try_fmt_out, >> + >> + .vidioc_g_selection = wave5_vpu_dec_g_selection, >> + .vidioc_s_selection = wave5_vpu_dec_s_selection, >> + >> + .vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs, >> + .vidioc_querybuf = v4l2_m2m_ioctl_querybuf, >> + .vidioc_create_bufs = wave5_vpu_dec_create_bufs, > >So this would just be dropped. > >> + .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf, >> + .vidioc_qbuf = v4l2_m2m_ioctl_qbuf, >> + .vidioc_expbuf = v4l2_m2m_ioctl_expbuf, >> + .vidioc_dqbuf = v4l2_m2m_ioctl_dqbuf, >> + .vidioc_streamon = v4l2_m2m_ioctl_streamon, >> + .vidioc_streamoff = v4l2_m2m_ioctl_streamoff, >> + >> + .vidioc_try_decoder_cmd = v4l2_m2m_ioctl_try_decoder_cmd, >> + .vidioc_decoder_cmd = wave5_vpu_dec_decoder_cmd, >> + >> + .vidioc_subscribe_event = wave5_vpu_subscribe_event, >> + .vidioc_unsubscribe_event = v4l2_event_unsubscribe, >> +}; > >This also means there is no need to document the new EOPNOTSUPP error >code in VIDIOC_CREATE_BUFS, or to modify v4l2-compliance. > >You *do* need to add a comment somewhere explaining why you don't >support this ioctl. I think it would be best to do that right after >'.vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs,'. So, besides this issue would you judge the v4l2 layer of the driver to be ready? Do you want a reviewed by tag for it or would you take it like this as well? > >Regards, > > Hans Sincerly, Sebastian >_______________________________________________ >Kernel mailing list -- kernel@mailman.collabora.com >To unsubscribe send an email to kernel-leave@mailman.collabora.com
On 16/10/2023 15:35, Sebastian Fricke wrote: > Hey Hans, > > On 16.10.2023 13:57, Hans Verkuil wrote: >> Hi Sebastian, >> >> On 12/10/2023 13:01, Sebastian Fricke wrote: >>> Add the decoder and encoder implementing the v4l2 >>> API. This patch also adds the Makefile and the VIDEO_WAVE_VPU config >>> >>> Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com> >>> Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> >>> Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com> >>> Signed-off-by: Robert Beckett <bob.beckett@collabora.com> >>> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> >>> Signed-off-by: Nas Chung <nas.chung@chipsnmedia.com> >>> --- >>> drivers/media/platform/chips-media/Kconfig | 1 + >>> drivers/media/platform/chips-media/Makefile | 1 + >>> drivers/media/platform/chips-media/wave5/Kconfig | 12 + >>> drivers/media/platform/chips-media/wave5/Makefile | 10 + >>> .../platform/chips-media/wave5/wave5-helper.c | 213 +++ >>> .../platform/chips-media/wave5/wave5-helper.h | 31 + >>> .../platform/chips-media/wave5/wave5-vpu-dec.c | 1953 ++++++++++++++++++++ >>> .../platform/chips-media/wave5/wave5-vpu-enc.c | 1794 ++++++++++++++++++ >>> .../media/platform/chips-media/wave5/wave5-vpu.c | 291 +++ >>> .../media/platform/chips-media/wave5/wave5-vpu.h | 83 + >>> .../platform/chips-media/wave5/wave5-vpuapi.h | 2 - >>> 11 files changed, 4389 insertions(+), 2 deletions(-) >>> >> >> <snip> >> >>> +static int wave5_vpu_dec_create_bufs(struct file *file, void *priv, >>> + struct v4l2_create_buffers *create) >>> +{ >>> + struct vpu_instance *inst = wave5_to_vpu_inst(priv); >>> + struct v4l2_format *f = &create->format; >>> + >>> + /* Firmware does not support CREATE_BUFS for CAPTURE queues. */ >>> + if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { >>> + dev_dbg(inst->dev->dev, >>> + "%s: VIDIOC_CREATE_BUFS not supported on CAPTURE queues.\n", >>> + __func__); >>> + return -EOPNOTSUPP; >>> + } >>> + >>> + return v4l2_m2m_ioctl_create_bufs(file, priv, create); >>> +} >> >> Regarding the EOPNOTSUPP discussion: I discussed this some more with >> Nicolas on irc, and we wonder if it isn't better to just drop create_bufs >> support for the wave5 decoder altogether. Is there any point in supporting >> it for OUTPUT but not CAPTURE? >> >> <snip> >> >>> +static const struct v4l2_ioctl_ops wave5_vpu_dec_ioctl_ops = { >>> + .vidioc_querycap = wave5_vpu_dec_querycap, >>> + .vidioc_enum_framesizes = wave5_vpu_dec_enum_framesizes, >>> + >>> + .vidioc_enum_fmt_vid_cap = wave5_vpu_dec_enum_fmt_cap, >>> + .vidioc_s_fmt_vid_cap_mplane = wave5_vpu_dec_s_fmt_cap, >>> + .vidioc_g_fmt_vid_cap_mplane = wave5_vpu_dec_g_fmt_cap, >>> + .vidioc_try_fmt_vid_cap_mplane = wave5_vpu_dec_try_fmt_cap, >>> + >>> + .vidioc_enum_fmt_vid_out = wave5_vpu_dec_enum_fmt_out, >>> + .vidioc_s_fmt_vid_out_mplane = wave5_vpu_dec_s_fmt_out, >>> + .vidioc_g_fmt_vid_out_mplane = wave5_vpu_g_fmt_out, >>> + .vidioc_try_fmt_vid_out_mplane = wave5_vpu_dec_try_fmt_out, >>> + >>> + .vidioc_g_selection = wave5_vpu_dec_g_selection, >>> + .vidioc_s_selection = wave5_vpu_dec_s_selection, >>> + >>> + .vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs, >>> + .vidioc_querybuf = v4l2_m2m_ioctl_querybuf, >>> + .vidioc_create_bufs = wave5_vpu_dec_create_bufs, >> >> So this would just be dropped. >> >>> + .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf, >>> + .vidioc_qbuf = v4l2_m2m_ioctl_qbuf, >>> + .vidioc_expbuf = v4l2_m2m_ioctl_expbuf, >>> + .vidioc_dqbuf = v4l2_m2m_ioctl_dqbuf, >>> + .vidioc_streamon = v4l2_m2m_ioctl_streamon, >>> + .vidioc_streamoff = v4l2_m2m_ioctl_streamoff, >>> + >>> + .vidioc_try_decoder_cmd = v4l2_m2m_ioctl_try_decoder_cmd, >>> + .vidioc_decoder_cmd = wave5_vpu_dec_decoder_cmd, >>> + >>> + .vidioc_subscribe_event = wave5_vpu_subscribe_event, >>> + .vidioc_unsubscribe_event = v4l2_event_unsubscribe, >>> +}; >> >> This also means there is no need to document the new EOPNOTSUPP error >> code in VIDIOC_CREATE_BUFS, or to modify v4l2-compliance. >> >> You *do* need to add a comment somewhere explaining why you don't >> support this ioctl. I think it would be best to do that right after >> '.vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs,'. > > So, besides this issue would you judge the v4l2 layer of the driver to > be ready? Do you want a reviewed by tag for it or would you take it like > this as well? No, it looks good. Please note though that patch 6/8 (dt-bindings) still needs an Acked/Reviewed-by from the device tree maintainers. There was a comment on it from Krzysztof. Regards, Hans > >> >> Regards, >> >> Hans > > Sincerly, > Sebastian >> _______________________________________________ >> Kernel mailing list -- kernel@mailman.collabora.com >> To unsubscribe send an email to kernel-leave@mailman.collabora.com
Le 12/10/2023 à 13:01, Sebastian Fricke a écrit : > From: Nas Chung <nas.chung@chipsnmedia.com> > > Add the vpuapi layer of the wave5 codec driver. > This layer is used to configure the hardware according > to the parameters. > > Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com> > Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> > Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> > Signed-off-by: Robert Beckett <bob.beckett@collabora.com> > Signed-off-by: Nas Chung <nas.chung@chipsnmedia.com> > --- ... > +int wave5_vpu_dec_clr_disp_flag(struct vpu_instance *inst, int index) > +{ > + struct dec_info *p_dec_info = &inst->codec_info->dec_info; > + int ret = 0; Nit: No need to init. > + struct vpu_device *vpu_dev = inst->dev; > + > + if (index >= p_dec_info->num_of_display_fbs) > + return -EINVAL; > + > + ret = mutex_lock_interruptible(&vpu_dev->hw_lock); > + if (ret) > + return ret; > + ret = wave5_dec_clr_disp_flag(inst, index); > + mutex_unlock(&vpu_dev->hw_lock); > + > + return ret; > +} ... > +int wave5_vpu_dec_give_command(struct vpu_instance *inst, enum codec_command cmd, void *parameter) > +{ > + struct dec_info *p_dec_info = &inst->codec_info->dec_info; > + int ret = 0; > + > + switch (cmd) { > + case DEC_GET_QUEUE_STATUS: { > + struct queue_status_info *queue_info = parameter; > + > + queue_info->instance_queue_count = p_dec_info->instance_queue_count; > + queue_info->report_queue_count = p_dec_info->report_queue_count; > + break; > + } > + case DEC_RESET_FRAMEBUF_INFO: { > + int i; > + > + for (i = 0; i < MAX_REG_FRAME; i++) { > + ret = wave5_vpu_dec_reset_framebuffer(inst, i); > + if (ret) > + break; > + } > + > + for (i = 0; i < MAX_REG_FRAME; i++) { > + ret = reset_auxiliary_buffers(inst, i); > + if (ret) > + break; > + } > + > + wave5_vdi_free_dma_memory(inst->dev, &p_dec_info->vb_task); > + break; > + } > + case DEC_GET_SEQ_INFO: { > + struct dec_initial_info *seq_info = parameter; > + > + *seq_info = p_dec_info->initial_info; > + break; > + } > + > + default: > + return -EINVAL; > + } > + > + return 0; return ret; ? CJ > +} ...
The Wave5 codec driver is a stateful encoder/decoder. It is found on the J721S2 SoC, JH7100 SoC, ssd202d SoC. Etc. But current test report is based on J721S2 SoC and pre-silicon FPGA. The driver currently supports V4L2_PIX_FMT_HEVC, V4L2_PIX_FMT_H264 for both encoding and decoding. This driver has so far been tested on J721S2 EVM board and pre-silicon FPGA. Testing on J721S2 EVM board shows it working fine both decoder and encoder. The driver is successfully working with gstreamer v4l2 good-plugin without any modification. We have based the tree on top of the latest https://git.linuxtv.org/media_tree.git repository. M2M framework modification: =========================== (Patch 1 & 2) Added a set of changes to enable ignoring the streaming state of the CAPTURE queue while checking whether a new job can be inserted into the ready queue. The use-case we encountered for this is a stateful decoder/encoder chip with a tight connection to a firmware. On that firmware the bitstream is first analyzed and the firmware produces output indicating the requirements for the output of the decode (e.g. the buffers of the CAPTURE queue). We want to be able to perform this action within the M2M job workflow in order to rely on the concurrency safety provided by the M2M jobs. v4l2-compliance results: ======================== v4l2-compliance 1.25.0-5100, 64 bits, 64-bit time_t v4l2-compliance SHA: 8bf6cba8c0ef 2023-10-10 12:50:46 Buffer ioctls: fail: v4l2-test-buffers.cpp(702): doioctl(node, VIDIOC_CREATE_BUFS, &crbufs) test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: FAIL test VIDIOC_EXPBUF: OK test Requests: OK (Not Supported) Total for wave5-dec device /dev/video0: 45, Succeeded: 44, Failed: 1, Warnings: 0 Total for wave5-enc device /dev/video1: 45, Succeeded: 45, Failed: 0, Warnings: 0 Fluster test results: ===================== Running test suite JCT-VC-HEVC_V1 with decoder GStreamer-H.265-V4L2-Gst1.0 Using 1 parallel job(s) Ran 133/147 tests successfully in 182.673 secs (1 test fails because of a missing frame and slight corruption (DeltaQP_A_BRCM_4), 2 tests fail because of sizes which are incompatible with the IP, 11 tests fail because of unsupported 10 bit format) Running test suite JVT-AVC_V1 with decoder GStreamer-H.264-V4L2-Gst1.0 Using 1 parallel job(s) Ran 78/135 tests successfully in 140.128 secs (57 fail because the hardware is unable to decode MBAFF / FMO / Field / Extended profile streams.) Encoder testing: ================ Among other tests the driver is able to produce valid output with the following test: `gst-launch-1.0 videotestsrc num-buffers=300 ! v4l2h264enc ! h264parse ! qtmux ! filesink location=test.mp4` Known missing features: ======================= * 48 bit memory addressing * Runtime suspend/resume support * Encoder support for the YUV 422 format * Support for the Background Detection encoder feature of the IP block * Support for the Region Of Interest encoder feature of the IP block Changes since v12: ================== * Add patch "arm64: dts: ti: k3-j721s2-main: add wave5 video encoder/decoder node" * Fix locking issues when mutex hw_lock is taken while holding state_spinlock * For [PATCH v12 1/7] media: v4l2: Add ignore_streaming flag: - rename flag: ignore_streaming -> ignore_cap_streaming - move flag from v4l2_m2m_queue_ctx to v4l2_m2m_ctx * For [PATCH v12 2/7] media: v4l2: Allow M2M job queuing w/o streaming CAP queue: - use renamed ignore_cap_streaming flag * For [PATCH v12 4/7] media: chips-media: wave5: Add vpuapi layer - refactor: wave5_bit_issue_command() accepts additional parameters - refactor: use wave5_send_query() where possible, clean up return values - fix: initialize additional registers and fix typo - fix: do not warn when rotation isn't enabled - fix: prevent decoder close failure by returning 0 from reset_auxiliary_buffers * For [PATCH v12 5/7] media: chips-media: wave5: Add the v4l2 layer - reduce interrupt handling to one function called by the irq handler thread - use dma_set_mask_and_coherent() and check if it returns an error - extend copyright: 2021 -> 2021-2023 - remove redundant work (e.g. type checking) already handled by v4l2 core - queue_setup: remove src_buf_count and dst_buf_count and rely on v4l2 counts - create_bufs: return EOPNOTSUPP when ioctl is unsupported by a queue - start_streaming: return buffers properly on error - minor fixes for typos, adding comments and small refactoring improvements * For [PATCH v12 6/7] dt-bindings: media: wave5: add yaml devicetree bindings - rename patch "media: dt-bindings: wave5: add Chips&Media 521c codec IP support" - remove clock-names; fix formatting Changes since v11: ================== * Major rework of the decoder - Fix concurrency issues by moving the commands that invoke actions on the firmware into the device_run function from M2M, effectively causing M2M to take care of the concurrency via its job queue. - In order to do that device_run needs to be able to run before both queues are ready, as a sequence needs to be initialized on the firmware to get the required buffer count & communicate the result back to userspace, thus we added a routine to allow jobs to be queued in M2M with only one of two queues being started. (See: "Add ignore_streaming flag to M2M" series) - Add support for more output formats (YUV422P, YUV422M, NV16, NV16M, NV61, NV61M) - Add proper state switch function to verify state switches - Simplify the queue_setup function and move the decoder opening to STREAMON as request in the review of V11 - Enable handling dynamic resolution change and seeking - Remove thumbnail mode * Similar reworks on the encoder - Move encoding into device_run and encoder opening + sequence intialization to STREAMON, this change simplifies the encoder as it previously was able to run multiple encode jobs simultaneously * Remove unused configurations and support for untested hardware - Remove the ability to configure the endianess of memory writes as only a single hardware can be tested so far - Remove the ability to configure the bitstream_mode, as the driver is currently hardcoded for the INTERRUPT mode - Remove support for all CODECS, that were not tested (everything besides H264/HEVC encoder + decoder) - The encoder currently contains a lot of configurable parameter, which are hard-coded in the `wave5_set_enc_openparam` function, remove all parameters which aren't currently specified in that configuration - Remove unused rotation and mirroring options from the decoder * Add FLUSH_FIRMWARE firmware command * Refactoring * Add wrappers for frequently used routines or to make the code more descriptive - Wrapper for firmware command calling `send_firmware_command` - Wrappers to intialize the sequence and to set up the framebuffers in the decoder and encoder - Using more general kernel functions and macros in various places * Add Macros for constant values and bit shifts * Fix typos and improve comments * Fix bug with M2M instance stored in the driver instance, multiple simultaneous instances would overwrite the M2M handler of each other. Use a M2M handler per device instead to avoid overwriting. * Adjust TRACE_PATH in the coda directory as highlighted in the review of V11 * Applied requested changes from review to the devicetree bindings file (the bindings check didn't return any warnings or errors) Changes since v10: ================== * Remove structure member from the encoder and decoder output info structs, that have assigned values from the registers but aren't used in the driver, add comments to describe the register values in the register definitions * Fix issue with decoding videos with a dimension where the height is not a multiple of 16 (270, 360, 540, 1024 etc.) * Fix incorrect variable format identifiers in printks * Use debug logs in loops to avoid flooding the message log * Use the swap() function instead of manual swapping of two values * Add extended controls for the encoder * Fix control flow issue while handling bitstream buffers, where an error while writing the source buffer into the hardware ring buffer would result in skipping the problematic buffer, which in turn causes a reordering of source buffers * Use the rectangle format as described by the hardware, the hardware uses for rectangles like the display rectangle 4 offsets (top, bottom, left, right), which depict the offset from the respective edge. Use this format instead of implicitly converting the bottom and right attributes to width and height attributes. * Return an error upon reading the sequence header while STREAMON * Squash the VDI and the VPUAPI layer commits as they had circular dependencies changes since v9: ================= * Move from staging to the media directory * Move coda driver to sub-directory * Fixes: * Use platform_get_irq instead of platform_get_resource to fetch the IRQ * General cleanups: * Add missing error messages to error conditions * Improve messages/variable names/comments, align parameter names across the driver * Use macros instead of magic numbers in multiple occassions * Reduce code duplication in multiple places * Fix whitespace, newline and tab alignment issues * Remove unused struct fields & commented out code * Convert signed integers to unsigned if signed is not necessary * Convert int/unsigned int to s32/u32, when the variable is assigned to the return of a register read or provided as a parameter for a register write (and vice versa) * Fix incorrect bitwise operators where logical operators are appropriate * Multiple smaller changes * Generalization: * Add new helper file providing generalized routines for vpu-dec & vpu-enc * Generalize luma & chroma table size calculation and stride calculation * Resource cleanup and error handling: * Add error handling to all calls with ignored return codes * Handle DMA resource cleanup properly * Fix insufficient instance cleanup while opening dec/enc Changes since v8: ================= * add 'wave5' to DEV_NAME * update to support Multi-stream * update to support loop test/dynamic resolution change * remove unnecessary memset, g_volatile, old version option Changes since v7: ================= * update v4l2-compliance test report * fix build error on linux-kernel 5.18.0-rc4 Changes since v6: ================= * update TODO file * get sram info from device tree Changes since v5: ================= * support NV12/NV21 pixelformat for encoder and decoder * handle adnormal exit and EOS Changes since v4: ================= * refactor functions in wave5-hw and fix bug reported by Daniel Palmer * rename functions and variables to better names * change variable types such as replacing s32 with u32 and int with bool * as appropriate Changes since v3: ================= * Fixing all issues commented by Dan Carpenter * Change file names to have wave5- prefix * In wave5_vpu_probe, enable the clocks before reading registers, as * commented from Daniel Palmer * Add more to the TODO list, Changes since v2: ================= Main fixes includes: * change the yaml and dirver code to support up to 4 clks (instead of * one) * fix Kconfig format * remove unneeded cast, * change var types * change var names, func names * checkpatch fixes Changes since v1: ================= Fix changes due to comments from Ezequiel and Dan Carpenter. Main fixes inclueds: * move all files to one dir 'wave5' * replace private error codes with standard error codes * fix extra spaces * various checkpatch fixes * replace private 'DPRINTK' macro with standard 'dev_err/dbg ..' * fix error handling * add more possible fixes to the TODO file To: Mauro Carvalho Chehab <mchehab@kernel.org> To: Hans Verkuil <hverkuil@xs4all.nl> To: Philipp Zabel <p.zabel@pengutronix.de> To: Shawn Guo <shawnguo@kernel.org> To: Sascha Hauer <s.hauer@pengutronix.de> To: Pengutronix Kernel Team <kernel@pengutronix.de> To: Fabio Estevam <festevam@gmail.com> To: NXP Linux Team <linux-imx@nxp.com> To: Jackson Lee <jackson.lee@chipsnmedia.com> To: Rob Herring <robh+dt@kernel.org> To: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> To: Conor Dooley <conor+dt@kernel.org> Cc: linux-media@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: devicetree@vger.kernel.org Cc: Nicolas Dufresne <nicolas.dufresne@collabora.com> Cc: Robert Beckett <bob.beckett@collabora.com> Cc: Nas Chung <nas.chung@chipsnmedia.com> CC: Tomasz Figa <tfiga@chromium.org> CC: kernel@collabora.com Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com> --- Darren Etheridge (1): arm64: dts: ti: k3-j721s2-main: add wave5 video encoder/decoder node Nas Chung (1): media: chips-media: wave5: Add vpuapi layer Robert Beckett (2): media: dt-bindings: wave5: add Chips&Media 521c codec IP support media: chips-media: wave5: Add wave5 driver to maintainers file Sebastian Fricke (4): media: v4l2: Add ignore_cap_streaming flag media: v4l2: Allow M2M job queuing w/o streaming CAP queue media: platform: chips-media: Move Coda to separate folder media: chips-media: wave5: Add the v4l2 layer .../devicetree/bindings/media/cnm,wave5.yaml | 60 + MAINTAINERS | 10 +- arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 14 + drivers/media/platform/chips-media/Kconfig | 18 +- drivers/media/platform/chips-media/Makefile | 6 +- drivers/media/platform/chips-media/coda/Kconfig | 18 + drivers/media/platform/chips-media/coda/Makefile | 6 + .../platform/chips-media/{ => coda}/coda-bit.c | 0 .../platform/chips-media/{ => coda}/coda-common.c | 0 .../platform/chips-media/{ => coda}/coda-gdi.c | 0 .../platform/chips-media/{ => coda}/coda-h264.c | 0 .../platform/chips-media/{ => coda}/coda-jpeg.c | 0 .../platform/chips-media/{ => coda}/coda-mpeg2.c | 0 .../platform/chips-media/{ => coda}/coda-mpeg4.c | 0 .../media/platform/chips-media/{ => coda}/coda.h | 0 .../platform/chips-media/{ => coda}/coda_regs.h | 0 .../platform/chips-media/{ => coda}/imx-vdoa.c | 0 .../platform/chips-media/{ => coda}/imx-vdoa.h | 0 .../media/platform/chips-media/{ => coda}/trace.h | 2 +- drivers/media/platform/chips-media/wave5/Kconfig | 12 + drivers/media/platform/chips-media/wave5/Makefile | 10 + .../platform/chips-media/wave5/wave5-helper.c | 213 ++ .../platform/chips-media/wave5/wave5-helper.h | 31 + .../media/platform/chips-media/wave5/wave5-hw.c | 2554 ++++++++++++++++++++ .../platform/chips-media/wave5/wave5-regdefine.h | 732 ++++++ .../media/platform/chips-media/wave5/wave5-vdi.c | 205 ++ .../media/platform/chips-media/wave5/wave5-vdi.h | 35 + .../platform/chips-media/wave5/wave5-vpu-dec.c | 1953 +++++++++++++++ .../platform/chips-media/wave5/wave5-vpu-enc.c | 1794 ++++++++++++++ .../media/platform/chips-media/wave5/wave5-vpu.c | 291 +++ .../media/platform/chips-media/wave5/wave5-vpu.h | 83 + .../platform/chips-media/wave5/wave5-vpuapi.c | 960 ++++++++ .../platform/chips-media/wave5/wave5-vpuapi.h | 870 +++++++ .../platform/chips-media/wave5/wave5-vpuconfig.h | 77 + .../platform/chips-media/wave5/wave5-vpuerror.h | 292 +++ drivers/media/platform/chips-media/wave5/wave5.h | 114 + drivers/media/v4l2-core/v4l2-mem2mem.c | 9 +- include/media/v4l2-mem2mem.h | 7 + 38 files changed, 10351 insertions(+), 25 deletions(-) --- base-commit: 2c1bae27df787c9535e48cc27bbd11c3c3e0a235 change-id: 20230929-wave5_v13_media_master-e0b8d0044cd4 Best regards,