@@ -75,6 +75,12 @@ struct mtk_jpeg_variant {
u32 cap_q_default_fourcc;
};
+struct mtk_jpeg_hw_param {
+ struct vb2_v4l2_buffer *src_buffer;
+ struct vb2_v4l2_buffer *dst_buffer;
+ struct mtk_jpeg_ctx *curr_ctx;
+};
+
enum mtk_jpegenc_hw_id {
MTK_JPEGENC_HW0,
MTK_JPEGENC_HW1,
@@ -120,6 +126,8 @@ struct mtk_jpegenc_comp_dev {
struct mtk_jpeg_dev *master_dev;
struct mtk_jpegenc_pm pm;
int jpegenc_irq;
+ struct delayed_work job_timeout_work;
+ struct mtk_jpeg_hw_param hw_param;
};
/**
@@ -271,6 +271,25 @@ void mtk_jpegenc_release_pm(struct mtk_jpegenc_comp_dev *mtkdev)
pm_runtime_disable(&pdev->dev);
}
+static void mtk_jpegenc_timeout_work(struct work_struct *work)
+{
+ struct delayed_work *Pwork =
+ container_of(work, struct delayed_work, work);
+ struct mtk_jpegenc_comp_dev *cjpeg =
+ container_of(Pwork, struct mtk_jpegenc_comp_dev,
+ job_timeout_work);
+ struct vb2_v4l2_buffer *src_buf;
+ enum vb2_buffer_state buf_state = VB2_BUF_STATE_ERROR;
+
+ src_buf = cjpeg->hw_param.src_buffer;
+
+ mtk_jpeg_enc_reset(cjpeg->reg_base);
+ clk_disable_unprepare(cjpeg->pm.venc_clk.clk_info->jpegenc_clk);
+ pm_runtime_put(cjpeg->pm.dev);
+
+ v4l2_m2m_buf_done(src_buf, buf_state);
+}
+
static irqreturn_t mtk_jpegenc_hw_irq_handler(int irq, void *priv)
{
struct mtk_jpegenc_comp_dev *jpeg = priv;
@@ -281,6 +300,8 @@ static irqreturn_t mtk_jpegenc_hw_irq_handler(int irq, void *priv)
enum vb2_buffer_state buf_state;
u32 result_size;
+ cancel_delayed_work(&jpeg->job_timeout_work);
+
irq_status = readl(jpeg->reg_base + JPEG_ENC_INT_STS) &
JPEG_ENC_INT_STATUS_MASK_ALLIRQ;
if (irq_status)
@@ -344,6 +365,8 @@ static int mtk_jpegenc_hw_probe(struct platform_device *pdev)
dev->plat_dev = pdev;
+ INIT_DELAYED_WORK(&dev->job_timeout_work, mtk_jpegenc_timeout_work);
+
ret = mtk_jpegenc_init_pm(dev);
if (ret) {
dev_err(&pdev->dev, "Failed to get jpeg enc clock source");
Generalizes jpegenc timeout func interfaces to handle HW timeout. Signed-off-by: kyrie.wu <kyrie.wu@mediatek.com> --- V4: new patch --- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 8 ++++++++ drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c | 23 +++++++++++++++++++++++ 2 files changed, 31 insertions(+)