@@ -1340,9 +1340,15 @@ void mtk_venc_buf_done(struct mtk_vcodec_ctx *ctx, int core_id,
if (key_frame)
dst_vb2_v4l2->flags |= V4L2_BUF_FLAG_KEYFRAME;
- v4l2_m2m_buf_done(src_vb2_v4l2, VB2_BUF_STATE_DONE);
- dst_vb2_v4l2->vb2_buf.planes[0].bytesused = bs_size;
- v4l2_m2m_buf_done(dst_vb2_v4l2, VB2_BUF_STATE_DONE);
+ if (time_out) {
+ v4l2_m2m_buf_done(src_vb2_v4l2, VB2_BUF_STATE_ERROR);
+ dst_vb2_v4l2->vb2_buf.planes[0].bytesused = 0;
+ v4l2_m2m_buf_done(dst_vb2_v4l2, VB2_BUF_STATE_ERROR);
+ } else {
+ v4l2_m2m_buf_done(src_vb2_v4l2, VB2_BUF_STATE_DONE);
+ dst_vb2_v4l2->vb2_buf.planes[0].bytesused = bs_size;
+ v4l2_m2m_buf_done(dst_vb2_v4l2, VB2_BUF_STATE_DONE);
+ }
}
}
@@ -16,6 +16,28 @@
#define VENC_PIC_FRM_TYPE 0x0010
#define VENC_PIC_KEY_FRM 0x2
+static void mtk_venc_timeout_worker(struct work_struct *work)
+{
+ struct mtk_venc_comp_dev *dev = container_of(work,
+ struct mtk_venc_comp_dev,
+ enc_timeout_worker.work);
+
+ struct mtk_vcodec_ctx *ctx;
+ unsigned long flags;
+
+ spin_lock_irqsave(&dev->master_dev->irqlock, flags);
+ ctx = dev->curr_ctx;
+
+ dev_err(&dev->plat_dev->dev, "core: %d timeout\n", dev->core_id);
+
+ mtk_venc_buf_done(ctx, dev->core_id, 0, 1, 0);
+
+ mtk_vcodec_enc_clock_off(dev->master_dev, dev->core_id);
+ dev->curr_ctx = NULL;
+ spin_unlock_irqrestore(&dev->master_dev->irqlock, flags);
+
+ mtk_venc_unlock(ctx, dev->core_id);
+}
/* Wake up core context wait_queue */
static void mtk_venc_comp_wake_up_ctx(struct mtk_vcodec_ctx *ctx,
unsigned int hw_id)
@@ -67,6 +89,7 @@ static irqreturn_t mtk_enc_comp_irq_handler(int irq, void *priv)
frm_type = readl(dev->reg_base + VENC_PIC_FRM_TYPE);
clean_irq_status(ctx->irq_status, addr);
if (ctx->irq_status & MTK_VENC_IRQ_STATUS_FRM) {
+ cancel_delayed_work(&dev->enc_timeout_worker);
if (ctx->hdr_size != 0) {
bs_size += ctx->hdr_size;
ctx->hdr_size = 0;
@@ -182,6 +205,9 @@ static int mtk_venc_comp_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, comp_dev);
+ INIT_DELAYED_WORK(&comp_dev->enc_timeout_worker,
+ mtk_venc_timeout_worker);
+
ret = component_add(&pdev->dev, &mtk_venc_component_ops);
if (ret) {
dev_err(&pdev->dev, "Failed to add component: %d\n", ret);
@@ -19,6 +19,7 @@
* @irq_status: venc hw irq status
* @enc_irq: venc device irq
* @core id: for venc core id: core#0, core#1...
+ * @enc_timeout_worker: venc timeout worker
*/
struct mtk_venc_comp_dev {
struct platform_device *plat_dev;
@@ -31,6 +32,7 @@ struct mtk_venc_comp_dev {
unsigned int irq_status;
int enc_irq;
int core_id;
+ struct delayed_work enc_timeout_worker;
};
#endif /* _MTK_VCODEC_ENC_HW_H_ */
@@ -10,11 +10,13 @@
#include "../mtk_vcodec_drv.h"
#include "../mtk_vcodec_util.h"
#include "../mtk_vcodec_enc_hw.h"
+#include "../mtk_vcodec_enc_pm.h"
static const char h264_filler_marker[] = {0x0, 0x0, 0x0, 0x1, 0xc};
#define H264_FILLER_MARKER_SIZE ARRAY_SIZE(h264_filler_marker)
#define VENC_PIC_BITSTREAM_BYTE_CNT 0x0098
+#define MTK_VENC_HW_TIMEOUT_MSEC 2000
enum venc_vpu_work_buf {
VENC_VPU_WORK_BUF_RC_INFO_CORE0,
@@ -413,6 +415,34 @@ static void h264_encode_filler(struct venc_common_inst *inst, void *buf,
memset(p, 0xff, size);
}
+static void init_schedule_work(struct mtk_vcodec_ctx *ctx)
+{
+ unsigned long timeout;
+ struct mtk_venc_comp_dev *venc;
+
+ venc = ctx->dev->enc_comp_dev[ctx->hw_id];
+ timeout = msecs_to_jiffies(MTK_VENC_HW_TIMEOUT_MSEC);
+ schedule_delayed_work(&venc->enc_timeout_worker, timeout);
+}
+
+static void cancel_schedule_work(struct mtk_vcodec_ctx *ctx)
+{
+ struct mtk_venc_comp_dev *venc;
+ unsigned long flags;
+
+ venc = ctx->dev->enc_comp_dev[ctx->hw_id];
+ cancel_delayed_work(&venc->enc_timeout_worker);
+
+ mtk_venc_buf_done(ctx, ctx->hw_id, 0, 1, 0);
+ mtk_vcodec_enc_clock_off(ctx->dev, ctx->hw_id);
+
+ spin_lock_irqsave(&ctx->dev->irqlock, flags);
+ venc->curr_ctx = NULL;
+ spin_unlock_irqrestore(&ctx->dev->irqlock, flags);
+
+ mtk_venc_unlock(ctx, ctx->hw_id);
+}
+
static int venc_init(struct mtk_vcodec_ctx *ctx)
{
int i;
@@ -489,12 +519,13 @@ static int venc_encode(void *handle,
ctx->pbs_buf[ctx->hw_id] = bs_buf->buf;
if (!inst->prepend_hdr) {
+ init_schedule_work(ctx);
ret = venc_encode_frame(inst, frm_buf, bs_buf,
&result->bs_size, ctx->hw_id);
if (ret) {
mtk_vcodec_err(inst, "encode frame failed: %d",
ret);
- return ret;
+ goto encode_err;
}
result->is_key_frm = inst->vpu_inst.is_key_frm;
@@ -503,11 +534,13 @@ static int venc_encode(void *handle,
mtk_vcodec_debug(inst, "venc_encode_frame prepend SPS/PPS");
+ init_schedule_work(ctx);
+
ret = venc_encode_header(inst, bs_buf, &bs_size_hdr);
if (ret) {
mtk_vcodec_err(inst, "encode prepend hdr failed: %d",
ret);
- return ret;
+ goto encode_err;
}
hdr_sz = bs_size_hdr;
@@ -530,7 +563,7 @@ static int venc_encode(void *handle,
if (ret) {
mtk_vcodec_err(inst, "encode hdr frame failed: %d",
ret);
- return ret;
+ goto encode_err;
}
result->bs_size = hdr_sz + filler_sz + bs_size_frm;
@@ -552,6 +585,10 @@ static int venc_encode(void *handle,
}
return ret;
+
+encode_err:
+ cancel_schedule_work(ctx);
+ return ret;
}
static int venc_set_param(void *handle,
When encoding timeout, a delayed timeout worker is needed because of asynchronous encoding process, restore encoding process in timeout worker. Signed-off-by: Irui Wang <irui.wang@mediatek.com> --- .../platform/mtk-vcodec/mtk_vcodec_enc.c | 12 ++++-- .../platform/mtk-vcodec/mtk_vcodec_enc_hw.c | 26 +++++++++++ .../platform/mtk-vcodec/mtk_vcodec_enc_hw.h | 2 + .../platform/mtk-vcodec/venc/venc_common_if.c | 43 +++++++++++++++++-- 4 files changed, 77 insertions(+), 6 deletions(-)