From 9ec057d41378ea065a9f24bc0a182bac0bc0f1a2 Mon Sep 17 00:00:00 2001 From: Ayoung Sim Date: Fri, 15 Jun 2018 16:15:29 +0900 Subject: [PATCH] [COMMON] media: mfc: DRV4.0: update prefix [BLACKBAR] Change-Id: I2a094c0c23fd2b071ecfa0237b1b5c6ed16c6253 Signed-off-by: Ayoung Sim --- drivers/media/platform/exynos/mfc/s5p_mfc_dec.c | 2 +- drivers/media/platform/exynos/mfc/s5p_mfc_inst.c | 2 +- drivers/media/platform/exynos/mfc/s5p_mfc_irq.c | 8 ++++---- drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_dec.c b/drivers/media/platform/exynos/mfc/s5p_mfc_dec.c index ff951b3c526b..41734b1d13f1 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_dec.c @@ -1146,7 +1146,7 @@ static int vidioc_g_crop(struct file *file, void *priv, cr->c.top = dec->black_bar.top; cr->c.width = dec->black_bar.width; cr->c.height = dec->black_bar.height; - mfc_debug(2, "black bar info: l=%d t=%d w=%d h=%d\n", + mfc_debug(2, "[BLACKBAR] Cropping info: l=%d t=%d w=%d h=%d\n", dec->black_bar.left, dec->black_bar.top, dec->black_bar.width, diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_inst.c b/drivers/media/platform/exynos/mfc/s5p_mfc_inst.c index b1c675c30385..463b11b7423b 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_inst.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_inst.c @@ -228,7 +228,7 @@ int s5p_mfc_decode_one_frame(struct s5p_mfc_ctx *ctx, int last_frame) reg &= ~(0x1 << S5P_FIMV_D_NAL_START_OPT_BLACK_BAR_SHIFT); reg |= ((dec->detect_black_bar & 0x1) << S5P_FIMV_D_NAL_START_OPT_BLACK_BAR_SHIFT); MFC_WRITEL(reg, S5P_FIMV_D_NAL_START_OPTIONS); - mfc_debug(3, "black bar detect set: %#x\n", reg); + mfc_debug(3, "[BLACKBAR] black bar detect set: %#x\n", reg); MFC_WRITEL(dec->dynamic_set, S5P_FIMV_D_DYNAMIC_DPB_FLAG_LOWER); MFC_WRITEL(0x0, S5P_FIMV_D_DYNAMIC_DPB_FLAG_UPPER); diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c b/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c index 7fb909ff0c22..4940722fe0c7 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c @@ -36,7 +36,7 @@ static void mfc_handle_black_bar_info(struct s5p_mfc_dev *dev, struct s5p_mfc_ct struct s5p_mfc_dec *dec = ctx->dec_priv; black_bar_info = s5p_mfc_get_black_bar_detection(); - mfc_debug(3, "black bar type: %#x\n", black_bar_info); + mfc_debug(3, "[BLACKBAR] type: %#x\n", black_bar_info); if (black_bar_info == S5P_FIMV_DISP_STATUS_BLACK_BAR) { new_black_bar.left = s5p_mfc_get_black_bar_pos_x(); @@ -54,7 +54,7 @@ static void mfc_handle_black_bar_info(struct s5p_mfc_dev *dev, struct s5p_mfc_ct new_black_bar.width = ctx->img_width; new_black_bar.height = ctx->img_height; } else { - mfc_err_ctx("Not supported black bar type: %#x\n", black_bar_info); + mfc_err_ctx("[BLACKBAR] Not supported type: %#x\n", black_bar_info); dec->black_bar_updated = 0; return; } @@ -63,7 +63,7 @@ static void mfc_handle_black_bar_info(struct s5p_mfc_dev *dev, struct s5p_mfc_ct (new_black_bar.top == dec->black_bar.top) && (new_black_bar.width == dec->black_bar.width) && (new_black_bar.height == dec->black_bar.height)) { - mfc_debug(3, "black bar info was not changed\n"); + mfc_debug(4, "[BLACKBAR] information was not changed\n"); dec->black_bar_updated = 0; return; } @@ -300,7 +300,7 @@ static void mfc_handle_frame_output_del(struct s5p_mfc_ctx *ctx, if (dec->black_bar_updated) { ref_mb->vb.reserved2 |= (1 << 5); - mfc_debug(3, "black bar detected\n"); + mfc_debug(3, "[BLACKBAR] black bar detected\n"); } if (ctx->src_fmt->mem_planes == 1) { diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c b/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c index d774689a7fbf..955a500ed351 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c @@ -92,7 +92,7 @@ int s5p_mfc_nal_q_check_enable(struct s5p_mfc_dev *dev) return 0; } if (dec->detect_black_bar) { - mfc_debug(2, "black bar detection is enabled\n"); + mfc_debug(2, "[BLACKBAR] black bar detection is enabled\n"); return 0; } /* NAL-Q doesn't support fixed byte(slice mode), CBR_VT(rc mode) */ -- 2.20.1