From 7679650000fb547100d91a4133d4c9245e39b576 Mon Sep 17 00:00:00 2001 From: Ayoung Sim Date: Fri, 15 Jun 2018 16:40:29 +0900 Subject: [PATCH] [COMMON] media: mfc: DRV4.0: update prefix [ROI] Change-Id: I29b23d18f1ce0d45f9e2ce4aa9d08b3b63654b5a Signed-off-by: Ayoung Sim --- drivers/media/platform/exynos/mfc/s5p_mfc_buf.c | 6 +++--- drivers/media/platform/exynos/mfc/s5p_mfc_enc.c | 2 +- drivers/media/platform/exynos/mfc/s5p_mfc_enc_ops.c | 8 ++++---- drivers/media/platform/exynos/mfc/s5p_mfc_enc_param.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_buf.c b/drivers/media/platform/exynos/mfc/s5p_mfc_buf.c index 0770d0efb895..22ed207bb4ac 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_buf.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_buf.c @@ -489,10 +489,10 @@ static int mfc_alloc_enc_roi_buffer(struct s5p_mfc_ctx *ctx, struct s5p_mfc_spec roi_buf->buftype = MFCBUF_NORMAL; roi_buf->size = buf_size->shared_buf; if (s5p_mfc_mem_ion_alloc(dev, roi_buf)) { - mfc_err_ctx("Allocating ROI buffer failed\n"); + mfc_err_ctx("[ROI] Allocating ROI buffer failed\n"); return -ENOMEM; } - mfc_debug(2, "roi_buf.daddr = 0x%08llx, vaddr = 0x%p\n", + mfc_debug(2, "[ROI] roi_buf.daddr = 0x%08llx, vaddr = 0x%p\n", roi_buf->daddr, roi_buf->vaddr); memset(roi_buf->vaddr, 0, buf_size->shared_buf); @@ -508,7 +508,7 @@ int s5p_mfc_alloc_enc_roi_buffer(struct s5p_mfc_ctx *ctx) for (i = 0; i < MFC_MAX_EXTRA_BUF; i++) { if (mfc_alloc_enc_roi_buffer(ctx, &enc->roi_buf[i]) < 0) { - mfc_err_dev("Remapping shared mem buffer failed.\n"); + mfc_err_dev("[ROI] Allocating remapping buffer[%d] failed\n", i); return -ENOMEM; } } diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_enc.c b/drivers/media/platform/exynos/mfc/s5p_mfc_enc.c index 4cc695cbf052..dff796d84238 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_enc.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_enc.c @@ -341,7 +341,7 @@ static int vidioc_s_fmt_vid_cap_mplane(struct file *file, void *priv, ret = s5p_mfc_alloc_enc_roi_buffer(ctx); if (ret) { - mfc_err_ctx("Failed to allocate ROI buffers.\n"); + mfc_err_ctx("[ROI] Failed to allocate ROI buffers\n"); s5p_mfc_release_instance_context(ctx); return -ENOMEM; } diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_ops.c b/drivers/media/platform/exynos/mfc/s5p_mfc_enc_ops.c index b958a590fe51..cc34ea73fc16 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_ops.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_enc_ops.c @@ -928,14 +928,14 @@ static int s5p_mfc_enc_to_buf_ctrls(struct s5p_mfc_ctx *ctx, struct list_head *h reg |= (enc->roi_info[index].lower_qp << 8); reg &= ~(0xFFFF << 16); reg |= (enc->roi_info[index].upper_qp << 16); - mfc_debug(3, "ROI: [%d] en %d, "\ + mfc_debug(3, "[ROI] buffer[%d] en %d, "\ "QP lower %d upper %d reg %#x\n", index, enc->roi_info[index].enable, enc->roi_info[index].lower_qp, enc->roi_info[index].upper_qp, reg); } else { - mfc_debug(3, "ROI: [%d] not enabled\n", index); + mfc_debug(3, "[ROI] buffer[%d] is not enabled\n", index); } buf_ctrl->val = reg; buf_ctrl->old_val2 = index; @@ -1167,7 +1167,7 @@ static void mfc_enc_set_buf_ctrls_exception(struct s5p_mfc_ctx *ctx, if (buf_ctrl->id == V4L2_CID_MPEG_VIDEO_ROI_CONTROL) { MFC_WRITEL(enc->roi_buf[buf_ctrl->old_val2].daddr, S5P_FIMV_E_ROI_BUFFER_ADDR); - mfc_debug(3, "ROI: buffer[%d] addr %#llx, QP val: %#x\n", + mfc_debug(3, "[ROI] buffer[%d] addr %#llx, QP val: %#x\n", buf_ctrl->old_val2, enc->roi_buf[buf_ctrl->old_val2].daddr, buf_ctrl->val); @@ -1458,7 +1458,7 @@ static int s5p_mfc_enc_set_buf_ctrls_val_nal_q_enc(struct s5p_mfc_ctx *ctx, pInStr->RcRoiCtrl |= (buf_ctrl->val & buf_ctrl->mask) << buf_ctrl->shft; pInStr->RoiBufferAddr = enc->roi_buf[buf_ctrl->old_val2].daddr; - mfc_debug(3, "NAL-Q: ROI: buffer[%d] addr %#llx, QP val: %#x\n", + mfc_debug(3, "NAL-Q:[ROI] buffer[%d] addr %#llx, QP val: %#x\n", buf_ctrl->old_val2, enc->roi_buf[buf_ctrl->old_val2].daddr, buf_ctrl->val); diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_param.c b/drivers/media/platform/exynos/mfc/s5p_mfc_enc_param.c index 52de357a2a43..81c07f8f5b99 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_param.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_enc_param.c @@ -1292,7 +1292,7 @@ void s5p_mfc_set_enc_params_hevc(struct s5p_mfc_ctx *ctx) reg &= ~(0x1); reg |= (p->roi_enable); MFC_WRITEL(reg, S5P_FIMV_E_RC_ROI_CTRL); - mfc_debug(3, "ROI: HEVC ROI enable\n"); + mfc_debug(3, "[ROI] HEVC ROI enable\n"); if (MFC_FEATURE_SUPPORT(dev, dev->pdata->color_aspect_enc) && p->check_color_range) { reg = MFC_READL(S5P_FIMV_E_VIDEO_SIGNAL_TYPE); -- 2.20.1