Hi Ezequiel,
1. Thanks for your suggestion.
On Thu, 2021-10-14 at 09:29 -0300, Ezequiel Garcia wrote:
> Hi Yunfei,
>
> On Mon, Oct 11, 2021 at 03:02:43PM +0800, Yunfei Dong wrote:
> > Core thread:
> > 1. Gets lat_buf from core msg queue.
> > 2. Proceeds core decode.
> > 3. Puts the lat_buf back to lat msg queue.
> >
> > Both H264 and VP9 rely on the core thread.
> >
>
> Avoid the kthread API and instead go with the workqueue API.
>
> See Documentation/core-api/workqueue.rst and
> include/linux/workqueue.h.
>
Fix it in patch v8.
> Thanks!
> Ezequiel
>
Thanks
Yunfei Dong
> > Signed-off-by: Yunfei Dong <yunfei.dong@xxxxxxxxxxxx>
> > ---
> > .../platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 12 +++++++
> > .../platform/mtk-vcodec/mtk_vcodec_drv.h | 7 ++++
> > .../platform/mtk-vcodec/vdec_msg_queue.c | 32
> > +++++++++++++++++++
> > .../platform/mtk-vcodec/vdec_msg_queue.h | 6 ++++
> > 4 files changed, 57 insertions(+)
> >
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
> > b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
> > index e21e0c4bcd86..de83e3b821b4 100644
> > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
> > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
> > @@ -364,6 +364,18 @@ static int mtk_vcodec_probe(struct
> > platform_device *pdev)
> > goto err_dec_pm;
> > }
> >
> > + if (VDEC_LAT_ARCH(dev->vdec_pdata->hw_arch)) {
> > + vdec_msg_queue_init_ctx(&dev->msg_queue_core_ctx,
> > + MTK_VDEC_CORE);
> > + dev->kthread_core =
> > kthread_run(vdec_msg_queue_core_thead, dev,
> > + "mtk-%s", "core");
> > + if (IS_ERR(dev->kthread_core)) {
> > + dev_err(&pdev->dev, "Failed to create core
> > thread");
> > + ret = PTR_ERR(dev->kthread_core);
> > + goto err_res;
> > + }
> > + }
> > +
> > for (i = 0; i < MTK_VDEC_HW_MAX; i++)
> > mutex_init(&dev->dec_mutex[i]);
> > spin_lock_init(&dev->irqlock);
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> > b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> > index 9d072c082f73..68a9b1a2d3b3 100644
> > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> > @@ -27,6 +27,7 @@
> > #define MTK_VCODEC_MAX_PLANES 3
> > #define MTK_V4L2_BENCHMARK 0
> > #define WAIT_INTR_TIMEOUT_MS 1000
> > +#define VDEC_LAT_ARCH(hw_arch) ((hw_arch) >=
> > MTK_VDEC_LAT_SINGLE_CORE)
> >
> > /*
> > * enum mtk_hw_reg_idx - MTK hw register base index
> > @@ -466,6 +467,9 @@ struct mtk_vcodec_enc_pdata {
> > * @comp_dev: component hardware device
> > * @component_node: component node
> > *
> > + * @kthread_core: thread used for core hardware decode
> > + * @msg_queue_core_ctx: msg queue context used for core thread
> > + *
> > * @hardware_bitmap: used to record hardware is ready or not
> > */
> > struct mtk_vcodec_dev {
> > @@ -508,6 +512,9 @@ struct mtk_vcodec_dev {
> > void *comp_dev[MTK_VDEC_HW_MAX];
> > struct device_node *component_node[MTK_VDEC_HW_MAX];
> >
> > + struct task_struct *kthread_core;
> > + struct vdec_msg_queue_ctx msg_queue_core_ctx;
> > +
> > DECLARE_BITMAP(hardware_bitmap, MTK_VDEC_HW_MAX);
> > };
> >
> > diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c
> > b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c
> > index d66ed98c79a9..665f571eab4b 100644
> > --- a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c
> > +++ b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c
> > @@ -256,3 +256,35 @@ void vdec_msg_queue_deinit(
> > kfree(lat_buf->private_data);
> > }
> > }
> > +
> > +int vdec_msg_queue_core_thead(void *data)
> > +{
> > + struct mtk_vcodec_dev *dev = data;
> > + struct vdec_lat_buf *lat_buf;
> > + struct mtk_vcodec_ctx *ctx;
> > +
> > + set_freezable();
> > + for (;;) {
> > + try_to_freeze();
> > + if (kthread_should_stop())
> > + break;
> > +
> > + lat_buf = vdec_msg_queue_dqbuf(&dev-
> > >msg_queue_core_ctx);
> > + if (!lat_buf)
> > + continue;
> > +
> > + ctx = lat_buf->ctx;
> > + mtk_vcodec_set_curr_ctx(dev, ctx, MTK_VDEC_CORE);
> > +
> > + if (!lat_buf->core_decode)
> > + mtk_v4l2_err("Core decode callback func is
> > NULL");
> > + else
> > + lat_buf->core_decode(lat_buf);
> > +
> > + mtk_vcodec_set_curr_ctx(dev, NULL, MTK_VDEC_CORE);
> > + vdec_msg_queue_qbuf(&ctx->msg_queue.lat_ctx, lat_buf);
> > + }
> > +
> > + mtk_v4l2_debug(3, "Video Capture Thread End");
> > + return 0;
> > +}
> > diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h
> > b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h
> > index 1905ce713592..b5745b144140 100644
> > --- a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h
> > +++ b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h
> > @@ -148,4 +148,10 @@ void vdec_msg_queue_deinit(
> > struct vdec_msg_queue *msg_queue,
> > struct mtk_vcodec_ctx *ctx);
> >
> > +/**
> > + * vdec_msg_queue_core_thead - used for core decoder.
> > + * @data: private data used for each codec
> > + */
> > +int vdec_msg_queue_core_thead(void *data);
> > +
> > #endif
> > --
> > 2.25.1
> >
