Re: [PATCH v2, 10/14] media: mtk-vcodec: Add core thread

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 





On 17.07.21 10:12, 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.

Signed-off-by: Yunfei Dong <yunfei.dong@xxxxxxxxxxxx>
---
v2: no changes
---
  .../platform/mtk-vcodec/mtk_vcodec_dec_drv.c  |  6 ++++
  .../platform/mtk-vcodec/mtk_vcodec_drv.h      |  3 ++
  .../platform/mtk-vcodec/vdec_msg_queue.c      | 32 +++++++++++++++++++
  .../platform/mtk-vcodec/vdec_msg_queue.h      |  6 ++++
  4 files changed, 47 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 078daeeff576..e05224aca888 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
@@ -437,6 +437,12 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
  		goto err_res;
  	}
+ if (VDEC_LAT_ARCH(dev->vdec_pdata->hw_arch)) {
+		vdec_msg_queue_init_ctx(&dev->core_ctx, MTK_VDEC_CORE);
+		dev->kthread_core = kthread_run(vdec_msg_queue_core_thead, dev,
+			"mtk-%s", "core");

why would we want to run this thread when probing?
also, don't we need to check errors?

+	}
+
  	for (i = 0; i < MTK_VDEC_HW_MAX; i++)
  		mutex_init(&dev->dec_mutex[i]);
  	mutex_init(&dev->dev_mutex);
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
index 9207ce079960..3beba0e2ea91 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
@@ -32,6 +32,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
@@ -480,6 +481,7 @@ struct mtk_vcodec_enc_pdata {
   * @component_node: component node
   * @comp_idx: component index
   *
+ * @kthread_core: thread used for core hardware decode
   * @core_ctx: core queue context
   */
  struct mtk_vcodec_dev {
@@ -524,6 +526,7 @@ struct mtk_vcodec_dev {
  	struct device_node *component_node[MTK_VDEC_HW_MAX];
  	int comp_idx;
+ struct task_struct *kthread_core;
  	struct vdec_msg_queue_ctx core_ctx;
  };
diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c
index 016a70416e55..60bc3796bb58 100644
--- a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c
+++ b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c
@@ -252,3 +252,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->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 297aa1598788..27ce528cbe89 100644
--- a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h
+++ b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h
@@ -134,4 +134,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




[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]

  Powered by Linux