media: mediatek: vcodec: Removing useless debug log

Removing unresonable and useless debug log enter and leave
in order to simply the log message.

Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c
index 8a75d28..805f8af 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c
@@ -459,7 +459,6 @@ static void mtk_vcodec_enc_remove(struct platform_device *pdev)
 {
        struct mtk_vcodec_dev *dev = platform_get_drvdata(pdev);
 
-       mtk_v4l2_debug_enter();
        destroy_workqueue(dev->encode_workqueue);
        if (dev->m2m_dev_enc)
                v4l2_m2m_release(dev->m2m_dev_enc);

diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h
index 7f12ba8..1f24114 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h
@@ -62,12 +62,6 @@ extern int mtk_vcodec_dbg;
                ((struct mtk_vcodec_ctx *)(h)->ctx)->id, ##args)
 #endif
 
-#define mtk_v4l2_debug_enter()  mtk_v4l2_debug(3, "+")
-#define mtk_v4l2_debug_leave()  mtk_v4l2_debug(3, "-")
-
-#define mtk_vcodec_debug_enter(h)  mtk_vcodec_debug(h, "+")
-#define mtk_vcodec_debug_leave(h)  mtk_vcodec_debug(h, "-")
-
 void __iomem *mtk_vcodec_get_reg_addr(void __iomem **reg_base, unsigned int reg_idx);
 int mtk_vcodec_write_vdecsys(struct mtk_vcodec_ctx *ctx, unsigned int reg, unsigned int val);
 int mtk_vcodec_mem_alloc(void *priv, struct mtk_vcodec_mem *mem);

diff --git a/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_if.c
index 481655b..24312a9 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_if.c
+++ b/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_if.c
@@ -156,8 +156,6 @@ static void free_predication_buf(struct vdec_h264_inst *inst)
 {
        struct mtk_vcodec_mem *mem = NULL;
 
-       mtk_vcodec_debug_enter(inst);
-
        inst->vsi->pred_buf_dma = 0;
        mem = &inst->pred_buf;
        if (mem->va)
@@ -311,8 +309,6 @@ static void vdec_h264_deinit(void *h_vdec)
 {
        struct vdec_h264_inst *inst = (struct vdec_h264_inst *)h_vdec;
 
-       mtk_vcodec_debug_enter(inst);
-
        vpu_dec_deinit(&inst->vpu);
        free_predication_buf(inst);
        free_mv_buf(inst);

diff --git a/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_if.c
index 4bc05ab..dc6ee26 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_if.c
+++ b/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_if.c
@@ -174,8 +174,6 @@ static void free_predication_buf(struct vdec_h264_slice_inst *inst)
 {
        struct mtk_vcodec_mem *mem = &inst->pred_buf;
 
-       mtk_vcodec_debug_enter(inst);
-
        inst->vsi_ctx.pred_buf_dma = 0;
        if (mem->va)
                mtk_vcodec_mem_free(inst->ctx, mem);
@@ -322,8 +320,6 @@ static void vdec_h264_slice_deinit(void *h_vdec)
 {
        struct vdec_h264_slice_inst *inst = h_vdec;
 
-       mtk_vcodec_debug_enter(inst);
-
        vpu_dec_deinit(&inst->vpu);
        free_predication_buf(inst);
        free_mv_buf(inst);

diff --git a/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_multi_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_multi_if.c
index a7e8e32..3cb5b96 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_multi_if.c
+++ b/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_multi_if.c
@@ -444,8 +444,6 @@ static void vdec_h264_slice_deinit(void *h_vdec)
 {
        struct vdec_h264_slice_inst *inst = h_vdec;
 
-       mtk_vcodec_debug_enter(inst);
-
        vpu_dec_deinit(&inst->vpu);
        vdec_h264_slice_free_mv_buf(inst);
        vdec_msg_queue_deinit(&inst->ctx->msg_queue, inst->ctx);

diff --git a/drivers/media/platform/mediatek/vcodec/vdec/vdec_hevc_req_multi_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_hevc_req_multi_if.c
index 1e6ab13..0bb5b54 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/vdec/vdec_hevc_req_multi_if.c
+++ b/drivers/media/platform/mediatek/vcodec/vdec/vdec_hevc_req_multi_if.c
@@ -911,8 +911,6 @@ static void vdec_hevc_slice_deinit(void *h_vdec)
        struct vdec_hevc_slice_inst *inst = h_vdec;
        struct mtk_vcodec_mem *mem;
 
-       mtk_vcodec_debug_enter(inst);
-
        vpu_dec_deinit(&inst->vpu);
        vdec_hevc_slice_free_mv_buf(inst);
 

diff --git a/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp8_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp8_if.c
index 9651f5e..c3a1fbb 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp8_if.c
+++ b/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp8_if.c
@@ -599,8 +599,6 @@ static void vdec_vp8_deinit(void *h_vdec)
 {
        struct vdec_vp8_inst *inst = (struct vdec_vp8_inst *)h_vdec;
 
-       mtk_vcodec_debug_enter(inst);
-
        vpu_dec_deinit(&inst->vpu);
        free_working_buf(inst);
        kfree(inst);

diff --git a/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp8_req_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp8_req_if.c
index e1fe260..f7181f4 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp8_req_if.c
+++ b/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp8_req_if.c
@@ -421,8 +421,6 @@ static void vdec_vp8_slice_deinit(void *h_vdec)
 {
        struct vdec_vp8_slice_inst *inst = h_vdec;
 
-       mtk_vcodec_debug_enter(inst);
-
        vpu_dec_deinit(&inst->vpu);
        vdec_vp8_slice_free_working_buf(inst);
        kfree(inst);

diff --git a/drivers/media/platform/mediatek/vcodec/vdec_vpu_if.c b/drivers/media/platform/mediatek/vcodec/vdec_vpu_if.c
index df309e8..60e5b70 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/vdec_vpu_if.c
+++ b/drivers/media/platform/mediatek/vcodec/vdec_vpu_if.c
@@ -183,8 +183,6 @@ int vpu_dec_init(struct vdec_vpu_inst *vpu)
        struct vdec_ap_ipi_init msg;
        int err;
 
-       mtk_vcodec_debug_enter(vpu);
-
        init_waitqueue_head(&vpu->wq);
        vpu->handler = vpu_dec_ipi_handler;
 
@@ -223,8 +221,6 @@ int vpu_dec_start(struct vdec_vpu_inst *vpu, uint32_t *data, unsigned int len)
        int i;
        int err = 0;
 
-       mtk_vcodec_debug_enter(vpu);
-
        if (len > ARRAY_SIZE(msg.data)) {
                mtk_vcodec_err(vpu, "invalid len = %d\n", len);
                return -EINVAL;
@@ -252,8 +248,6 @@ int vpu_dec_get_param(struct vdec_vpu_inst *vpu, uint32_t *data,
        struct vdec_ap_ipi_get_param msg;
        int err;
 
-       mtk_vcodec_debug_enter(vpu);
-
        if (len > ARRAY_SIZE(msg.data)) {
                mtk_vcodec_err(vpu, "invalid len = %d\n", len);
                return -EINVAL;

diff --git a/drivers/media/platform/mediatek/vcodec/venc/venc_h264_if.c b/drivers/media/platform/mediatek/vcodec/venc/venc_h264_if.c
index 10365c9..c821ed4 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/venc/venc_h264_if.c
+++ b/drivers/media/platform/mediatek/vcodec/venc/venc_h264_if.c
@@ -298,8 +298,6 @@ static void h264_enc_free_work_buf(struct venc_h264_inst *inst)
 {
        int i;
 
-       mtk_vcodec_debug_enter(inst);
-
        /* Except the SKIP_FRAME buffers,
         * other buffers need to be freed by AP.
         */
@@ -309,8 +307,6 @@ static void h264_enc_free_work_buf(struct venc_h264_inst *inst)
        }
 
        mtk_vcodec_mem_free(inst->ctx, &inst->pps_buf);
-
-       mtk_vcodec_debug_leave(inst);
 }
 
 static int h264_enc_alloc_work_buf(struct venc_h264_inst *inst, bool is_34bit)
@@ -321,8 +317,6 @@ static int h264_enc_alloc_work_buf(struct venc_h264_inst *inst, bool is_34bit)
        u32 vpua, wb_size;
        int ret = 0;
 
-       mtk_vcodec_debug_enter(inst);
-
        if (is_34bit)
                wb_34 = inst->vsi_34->work_bufs;
        else
@@ -406,8 +400,6 @@ static int h264_enc_alloc_work_buf(struct venc_h264_inst *inst, bool is_34bit)
                goto err_alloc;
        }
 
-       mtk_vcodec_debug_leave(inst);
-
        return ret;
 
 err_alloc:
@@ -452,8 +444,6 @@ static int h264_encode_sps(struct venc_h264_inst *inst,
        int ret = 0;
        unsigned int irq_status;
 
-       mtk_vcodec_debug_enter(inst);
-
        ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_SPS, NULL, bs_buf, NULL);
        if (ret)
                return ret;
@@ -478,8 +468,6 @@ static int h264_encode_pps(struct venc_h264_inst *inst,
        int ret = 0;
        unsigned int irq_status;
 
-       mtk_vcodec_debug_enter(inst);
-
        ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_PPS, NULL, bs_buf, NULL);
        if (ret)
                return ret;
@@ -531,7 +519,6 @@ static int h264_encode_frame(struct venc_h264_inst *inst,
        struct venc_frame_info frame_info;
        struct mtk_vcodec_ctx *ctx = inst->ctx;
 
-       mtk_vcodec_debug_enter(inst);
        mtk_vcodec_debug(inst, "frm_cnt = %d\n ", inst->frm_cnt);
 
        if (MTK_ENC_IOVA_IS_34BIT(ctx)) {
@@ -614,8 +601,6 @@ static int h264_enc_init(struct mtk_vcodec_ctx *ctx)
        inst->vpu_inst.id = is_ext ? SCP_IPI_VENC_H264 : IPI_VENC_H264;
        inst->hw_base = mtk_vcodec_get_reg_addr(inst->ctx->dev->reg_base, VENC_SYS);
 
-       mtk_vcodec_debug_enter(inst);
-
        ret = vpu_enc_init(&inst->vpu_inst);
 
        if (MTK_ENC_IOVA_IS_34BIT(ctx))
@@ -623,8 +608,6 @@ static int h264_enc_init(struct mtk_vcodec_ctx *ctx)
        else
                inst->vsi = (struct venc_h264_vsi *)inst->vpu_inst.vsi;
 
-       mtk_vcodec_debug_leave(inst);
-
        if (ret)
                kfree(inst);
        else
@@ -811,8 +794,6 @@ static int h264_enc_set_param(void *handle,
                break;
        }
 
-       mtk_vcodec_debug_leave(inst);
-
        return ret;
 }
 
@@ -821,14 +802,11 @@ static int h264_enc_deinit(void *handle)
        int ret = 0;
        struct venc_h264_inst *inst = (struct venc_h264_inst *)handle;
 
-       mtk_vcodec_debug_enter(inst);
-
        ret = vpu_enc_deinit(&inst->vpu_inst);
 
        if (inst->work_buf_allocated)
                h264_enc_free_work_buf(inst);
 
-       mtk_vcodec_debug_leave(inst);
        kfree(inst);
 
        return ret;

diff --git a/drivers/media/platform/mediatek/vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mediatek/vcodec/venc/venc_vp8_if.c
index 73ebc35..ddcdb56 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/venc/venc_vp8_if.c
+++ b/drivers/media/platform/mediatek/vcodec/venc/venc_vp8_if.c
@@ -141,16 +141,12 @@ static void vp8_enc_free_work_buf(struct venc_vp8_inst *inst)
 {
        int i;
 
-       mtk_vcodec_debug_enter(inst);
-
        /* Buffers need to be freed by AP. */
        for (i = 0; i < VENC_VP8_VPU_WORK_BUF_MAX; i++) {
                if (inst->work_bufs[i].size == 0)
                        continue;
                mtk_vcodec_mem_free(inst->ctx, &inst->work_bufs[i]);
        }
-
-       mtk_vcodec_debug_leave(inst);
 }
 
 static int vp8_enc_alloc_work_buf(struct venc_vp8_inst *inst)
@@ -159,8 +155,6 @@ static int vp8_enc_alloc_work_buf(struct venc_vp8_inst *inst)
        int ret = 0;
        struct venc_vp8_vpu_buf *wb = inst->vsi->work_bufs;
 
-       mtk_vcodec_debug_enter(inst);
-
        for (i = 0; i < VENC_VP8_VPU_WORK_BUF_MAX; i++) {
                if (wb[i].size == 0)
                        continue;
@@ -206,8 +200,6 @@ static int vp8_enc_alloc_work_buf(struct venc_vp8_inst *inst)
                                 inst->work_bufs[i].size);
        }
 
-       mtk_vcodec_debug_leave(inst);
-
        return ret;
 
 err_alloc:
@@ -338,14 +330,10 @@ static int vp8_enc_init(struct mtk_vcodec_ctx *ctx)
        inst->vpu_inst.id = IPI_VENC_VP8;
        inst->hw_base = mtk_vcodec_get_reg_addr(inst->ctx->dev->reg_base, VENC_LT_SYS);
 
-       mtk_vcodec_debug_enter(inst);
-
        ret = vpu_enc_init(&inst->vpu_inst);
 
        inst->vsi = (struct venc_vp8_vsi *)inst->vpu_inst.vsi;
 
-       mtk_vcodec_debug_leave(inst);
-
        if (ret)
                kfree(inst);
        else
@@ -364,8 +352,6 @@ static int vp8_enc_encode(void *handle,
        struct venc_vp8_inst *inst = (struct venc_vp8_inst *)handle;
        struct mtk_vcodec_ctx *ctx = inst->ctx;
 
-       mtk_vcodec_debug_enter(inst);
-
        enable_irq(ctx->dev->enc_irq);
 
        switch (opt) {
@@ -386,8 +372,6 @@ static int vp8_enc_encode(void *handle,
 encode_err:
 
        disable_irq(ctx->dev->enc_irq);
-       mtk_vcodec_debug_leave(inst);
-
        return ret;
 }
 
@@ -437,8 +421,6 @@ static int vp8_enc_set_param(void *handle,
                break;
        }
 
-       mtk_vcodec_debug_leave(inst);
-
        return ret;
 }
 
@@ -447,16 +429,12 @@ static int vp8_enc_deinit(void *handle)
        int ret = 0;
        struct venc_vp8_inst *inst = (struct venc_vp8_inst *)handle;
 
-       mtk_vcodec_debug_enter(inst);
-
        ret = vpu_enc_deinit(&inst->vpu_inst);
 
        if (inst->work_buf_allocated)
                vp8_enc_free_work_buf(inst);
 
-       mtk_vcodec_debug_leave(inst);
        kfree(inst);
-
        return ret;
 }
 

diff --git a/drivers/media/platform/mediatek/vcodec/venc_vpu_if.c b/drivers/media/platform/mediatek/vcodec/venc_vpu_if.c
index 09e7eaa..63ebab2 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/venc_vpu_if.c
+++ b/drivers/media/platform/mediatek/vcodec/venc_vpu_if.c
@@ -55,8 +55,10 @@ static void vpu_enc_ipi_handler(void *data, unsigned int len, void *priv)
 
        vpu->signaled = 1;
        vpu->failure = (msg->status != VENC_IPI_MSG_STATUS_OK);
-       if (vpu->failure)
-               goto failure;
+       if (vpu->failure) {
+               mtk_vcodec_err(vpu, "vpu enc status failure %d", vpu->failure);
+               return;
+       }
 
        switch (msg->msg_id) {
        case VPU_IPIMSG_ENC_INIT_DONE:
@@ -73,9 +75,6 @@ static void vpu_enc_ipi_handler(void *data, unsigned int len, void *priv)
                mtk_vcodec_err(vpu, "unknown msg id %x", msg->msg_id);
                break;
        }
-
-failure:
-       mtk_vcodec_debug_leave(vpu);
 }
 
 static int vpu_enc_send_msg(struct venc_vpu_inst *vpu, void *msg,
@@ -83,8 +82,6 @@ static int vpu_enc_send_msg(struct venc_vpu_inst *vpu, void *msg,
 {
        int status;
 
-       mtk_vcodec_debug_enter(vpu);
-
        if (!vpu->ctx->dev->fw_handler) {
                mtk_vcodec_err(vpu, "inst dev is NULL");
                return -EINVAL;
@@ -100,8 +97,6 @@ static int vpu_enc_send_msg(struct venc_vpu_inst *vpu, void *msg,
        if (vpu->failure)
                return -EINVAL;
 
-       mtk_vcodec_debug_leave(vpu);
-
        return 0;
 }
 
@@ -110,8 +105,6 @@ int vpu_enc_init(struct venc_vpu_inst *vpu)
        int status;
        struct venc_ap_ipi_msg_init out;
 
-       mtk_vcodec_debug_enter(vpu);
-
        init_waitqueue_head(&vpu->wq_hd);
        vpu->signaled = 0;
        vpu->failure = 0;
@@ -132,8 +125,6 @@ int vpu_enc_init(struct venc_vpu_inst *vpu)
                return -EINVAL;
        }
 
-       mtk_vcodec_debug_leave(vpu);
-
        return 0;
 }
 
@@ -345,8 +336,6 @@ int vpu_enc_deinit(struct venc_vpu_inst *vpu)
 {
        struct venc_ap_ipi_msg_deinit out;
 
-       mtk_vcodec_debug_enter(vpu);
-
        memset(&out, 0, sizeof(out));
        out.msg_id = AP_IPIMSG_ENC_DEINIT;
        out.vpu_inst_addr = vpu->inst_addr;
@@ -355,7 +344,5 @@ int vpu_enc_deinit(struct venc_vpu_inst *vpu)
                return -EINVAL;
        }
 
-       mtk_vcodec_debug_leave(vpu);
-
        return 0;
 }