Skip to content

Commit

Permalink
media: mediatek: vcodec: move core context from device to each instance
Browse files Browse the repository at this point in the history 
There are so many lat buffer in core context list, some instances
maybe be scheduled for a very long time. Moving the core context to
each instance, it only be used to control lat buffer of each instance.
And the core work queue of each instance is scheduled by system.

Fixes: 2cfca6c ("media: mediatek: vcodec: move lat_buf to the top of core list")
Signed-off-by: Yunfei Dong <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
  • Loading branch information
@yunfei-mtk @mchehab
yunfei-mtk authored and mchehab committed May 26, 2023
1 parent 2864e30 commit 297160d
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 46 deletions.
1 change: 0 additions & 1 deletion drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,6 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
}

if (IS_VDEC_LAT_ARCH(dev->vdec_pdata->hw_arch)) {
vdec_msg_queue_init_ctx(&dev->msg_queue_core_ctx, MTK_VDEC_CORE);
dev->core_workqueue =
alloc_ordered_workqueue("core-decoder",
WQ_MEM_RECLAIM | WQ_FREEZABLE);
Expand Down
2 changes: 0 additions & 2 deletions drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,6 @@ struct mtk_vcodec_enc_pdata {
* @enc_capability: used to identify encode capability
*
* @core_workqueue: queue used for core hardware decode
* @msg_queue_core_ctx: msg queue context used for core workqueue
*
* @subdev_dev: subdev hardware device
* @subdev_prob_done: check whether all used hw device is prob done
Expand Down Expand Up @@ -511,7 +510,6 @@ struct mtk_vcodec_dev {
unsigned int enc_capability;

struct workqueue_struct *core_workqueue;
struct vdec_msg_queue_ctx msg_queue_core_ctx;

void *subdev_dev[MTK_VDEC_HW_MAX];
int (*subdev_prob_done)(struct mtk_vcodec_dev *vdec_dev);
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_multi_if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ static int vdec_h264_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
if (IS_VDEC_INNER_RACING(inst->ctx->dev->dec_capability)) {
memcpy(&share_info->h264_slice_params, &inst->vsi->h264_slice_params,
sizeof(share_info->h264_slice_params));
vdec_msg_queue_qbuf(&inst->ctx->dev->msg_queue_core_ctx, lat_buf);
vdec_msg_queue_qbuf(&inst->ctx->msg_queue.core_ctx, lat_buf);
}

/* wait decoder done interrupt */
Expand All @@ -698,7 +698,7 @@ static int vdec_h264_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
if (!IS_VDEC_INNER_RACING(inst->ctx->dev->dec_capability)) {
memcpy(&share_info->h264_slice_params, &inst->vsi->h264_slice_params,
sizeof(share_info->h264_slice_params));
vdec_msg_queue_qbuf(&inst->ctx->dev->msg_queue_core_ctx, lat_buf);
vdec_msg_queue_qbuf(&inst->ctx->msg_queue.core_ctx, lat_buf);
}
mtk_vcodec_debug(inst, "dec num: %d lat crc: 0x%x 0x%x 0x%x", inst->slice_dec_num,
inst->vsi->dec.crc[0], inst->vsi->dec.crc[1], inst->vsi->dec.crc[2]);
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/platform/mediatek/vcodec/vdec/vdec_hevc_req_multi_if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@ static int vdec_hevc_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
if (IS_VDEC_INNER_RACING(inst->ctx->dev->dec_capability)) {
memcpy(&share_info->hevc_slice_params, &inst->vsi->hevc_slice_params,
sizeof(share_info->hevc_slice_params));
vdec_msg_queue_qbuf(&inst->ctx->dev->msg_queue_core_ctx, lat_buf);
vdec_msg_queue_qbuf(&inst->ctx->msg_queue.core_ctx, lat_buf);
}

/* wait decoder done interrupt */
Expand All @@ -1043,7 +1043,7 @@ static int vdec_hevc_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
if (!IS_VDEC_INNER_RACING(inst->ctx->dev->dec_capability)) {
memcpy(&share_info->hevc_slice_params, &inst->vsi->hevc_slice_params,
sizeof(share_info->hevc_slice_params));
vdec_msg_queue_qbuf(&inst->ctx->dev->msg_queue_core_ctx, lat_buf);
vdec_msg_queue_qbuf(&inst->ctx->msg_queue.core_ctx, lat_buf);
}
mtk_vcodec_debug(inst, "dec num: %d lat crc: 0x%x 0x%x 0x%x", inst->slice_dec_num,
inst->vsi->dec.crc[0], inst->vsi->dec.crc[1], inst->vsi->dec.crc[2]);
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2119,7 +2119,7 @@ static int vdec_vp9_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
vdec_msg_queue_update_ube_wptr(&ctx->msg_queue,
vsi->trans.dma_addr_end +
ctx->msg_queue.wdma_addr.dma_addr);
vdec_msg_queue_qbuf(&ctx->dev->msg_queue_core_ctx, lat_buf);
vdec_msg_queue_qbuf(&ctx->msg_queue.core_ctx, lat_buf);

return 0;
err_free_fb_out:
Expand Down
55 changes: 19 additions & 36 deletions drivers/media/platform/mediatek/vcodec/vdec_msg_queue.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,29 +177,20 @@ void vdec_msg_queue_update_ube_wptr(struct vdec_msg_queue *msg_queue, uint64_t u

bool vdec_msg_queue_wait_lat_buf_full(struct vdec_msg_queue *msg_queue)
{
struct vdec_lat_buf *buf, *tmp;
struct list_head *list_core[3];
struct vdec_msg_queue_ctx *core_ctx;
int ret, i, in_core_count = 0, count = 0;
int ret;
long timeout_jiff;

core_ctx = &msg_queue->ctx->dev->msg_queue_core_ctx;
spin_lock(&core_ctx->ready_lock);
list_for_each_entry_safe(buf, tmp, &core_ctx->ready_queue, core_list) {
if (buf && buf->ctx == msg_queue->ctx) {
list_core[in_core_count++] = &buf->core_list;
list_del(&buf->core_list);
}
}

for (i = 0; i < in_core_count; i++) {
list_add(list_core[in_core_count - (1 + i)], &core_ctx->ready_queue);
queue_work(msg_queue->ctx->dev->core_workqueue, &msg_queue->core_work);
if (atomic_read(&msg_queue->lat_list_cnt) == NUM_BUFFER_COUNT) {
mtk_v4l2_debug(3, "wait buf full: list(%d %d) ready_num:%d status:%d",
atomic_read(&msg_queue->lat_list_cnt),
atomic_read(&msg_queue->core_list_cnt),
msg_queue->lat_ctx.ready_num,
msg_queue->status);
return true;
}
spin_unlock(&core_ctx->ready_lock);

timeout_jiff = msecs_to_jiffies(1000 * (NUM_BUFFER_COUNT + 2));
ret = wait_event_timeout(msg_queue->ctx->msg_queue.core_dec_done,
ret = wait_event_timeout(msg_queue->core_dec_done,
msg_queue->lat_ctx.ready_num == NUM_BUFFER_COUNT,
timeout_jiff);
if (ret) {
Expand All @@ -208,18 +199,9 @@ bool vdec_msg_queue_wait_lat_buf_full(struct vdec_msg_queue *msg_queue)
return true;
}

spin_lock(&core_ctx->ready_lock);
list_for_each_entry_safe(buf, tmp, &core_ctx->ready_queue, core_list) {
if (buf && buf->ctx == msg_queue->ctx) {
count++;
list_del(&buf->core_list);
}
}
spin_unlock(&core_ctx->ready_lock);

mtk_v4l2_err("failed with lat buf isn't full: list(%d %d) count:%d",
mtk_v4l2_err("failed with lat buf isn't full: list(%d %d)",
atomic_read(&msg_queue->lat_list_cnt),
atomic_read(&msg_queue->core_list_cnt), count);
atomic_read(&msg_queue->core_list_cnt));

return false;
}
Expand Down Expand Up @@ -247,6 +229,8 @@ void vdec_msg_queue_deinit(struct vdec_msg_queue *msg_queue,

kfree(lat_buf->private_data);
}

cancel_work_sync(&msg_queue->core_work);
}

static void vdec_msg_queue_core_work(struct work_struct *work)
Expand All @@ -258,11 +242,11 @@ static void vdec_msg_queue_core_work(struct work_struct *work)
struct mtk_vcodec_dev *dev = ctx->dev;
struct vdec_lat_buf *lat_buf;

spin_lock(&ctx->dev->msg_queue_core_ctx.ready_lock);
spin_lock(&msg_queue->core_ctx.ready_lock);
ctx->msg_queue.status &= ~CONTEXT_LIST_QUEUED;
spin_unlock(&ctx->dev->msg_queue_core_ctx.ready_lock);
spin_unlock(&msg_queue->core_ctx.ready_lock);

lat_buf = vdec_msg_queue_dqbuf(&dev->msg_queue_core_ctx);
lat_buf = vdec_msg_queue_dqbuf(&msg_queue->core_ctx);
if (!lat_buf)
return;

Expand All @@ -276,12 +260,11 @@ static void vdec_msg_queue_core_work(struct work_struct *work)
mtk_vcodec_dec_disable_hardware(ctx, MTK_VDEC_CORE);
vdec_msg_queue_qbuf(&ctx->msg_queue.lat_ctx, lat_buf);

wake_up_all(&ctx->msg_queue.core_dec_done);
if (!(ctx->msg_queue.status & CONTEXT_LIST_QUEUED) &&
atomic_read(&msg_queue->core_list_cnt)) {
spin_lock(&ctx->dev->msg_queue_core_ctx.ready_lock);
spin_lock(&msg_queue->core_ctx.ready_lock);
ctx->msg_queue.status |= CONTEXT_LIST_QUEUED;
spin_unlock(&ctx->dev->msg_queue_core_ctx.ready_lock);
spin_unlock(&msg_queue->core_ctx.ready_lock);
queue_work(ctx->dev->core_workqueue, &msg_queue->core_work);
}
}
Expand All @@ -297,8 +280,8 @@ int vdec_msg_queue_init(struct vdec_msg_queue *msg_queue,
if (msg_queue->wdma_addr.size)
return 0;

msg_queue->ctx = ctx;
vdec_msg_queue_init_ctx(&msg_queue->lat_ctx, MTK_VDEC_LAT0);
vdec_msg_queue_init_ctx(&msg_queue->core_ctx, MTK_VDEC_CORE);
INIT_WORK(&msg_queue->core_work, vdec_msg_queue_core_work);

atomic_set(&msg_queue->lat_list_cnt, 0);
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/platform/mediatek/vcodec/vdec_msg_queue.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ struct vdec_lat_buf {
* @wdma_wptr_addr: ube write point
* @core_work: core hardware work
* @lat_ctx: used to store lat buffer list
* @ctx: point to mtk_vcodec_ctx
* @core_ctx: used to store core buffer list
*
* @lat_list_cnt: used to record each instance lat list count
* @core_list_cnt: used to record each instance core list count
Expand All @@ -100,7 +100,7 @@ struct vdec_msg_queue {

struct work_struct core_work;
struct vdec_msg_queue_ctx lat_ctx;
struct mtk_vcodec_ctx *ctx;
struct vdec_msg_queue_ctx core_ctx;

atomic_t lat_list_cnt;
atomic_t core_list_cnt;
Expand Down

0 comments on commit 297160d

Please sign in to comment.