From: Ayoung Sim Date: Mon, 18 Jun 2018 02:22:37 +0000 (+0900) Subject: [COMMON] media: mfc: DRV4.0: update prefix [DRC] X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6cd1faa4b8a57ba5a8ce47de276a4a8ada02fd64;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [COMMON] media: mfc: DRV4.0: update prefix [DRC] Change-Id: Ib9379c00da450026723b1f76b2472ac60bd60be1 Signed-off-by: Ayoung Sim --- diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_enc.c b/drivers/media/platform/exynos/mfc/s5p_mfc_enc.c index dff796d84238..8b413c80b117 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_enc.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_enc.c @@ -430,7 +430,7 @@ static int vidioc_s_fmt_vid_out_mplane(struct file *file, void *priv, if (ctx->state == MFCINST_RUNNING) { s5p_mfc_change_state(ctx, MFCINST_GOT_INST); - mfc_info_ctx("Enc resolution is changed\n"); + mfc_info_ctx("[DRC] Enc resolution is changed\n"); } mfc_info_ctx("Enc input pixelformat : %s\n", ctx->src_fmt->name); diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_hwlock.c b/drivers/media/platform/exynos/mfc/s5p_mfc_hwlock.c index 62ea0d64ab05..b680f74bf836 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_hwlock.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_hwlock.c @@ -761,9 +761,9 @@ static int mfc_just_run_dec(struct s5p_mfc_ctx *ctx) ret = s5p_mfc_run_dec_last_frames(ctx); break; case MFCINST_RES_CHANGE_END: - mfc_debug(2, "Finished remaining frames after resolution change.\n"); + mfc_debug(2, "[DRC] Finished remaining frames after resolution change\n"); ctx->capture_state = QUEUE_FREE; - mfc_debug(2, "Will re-init the codec.\n"); + mfc_debug(2, "[DRC] Will re-init the codec\n"); ret = s5p_mfc_run_dec_init(ctx); break; case MFCINST_DPB_FLUSHING: diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c b/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c index fd5844c142ef..c3673df41027 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c @@ -623,15 +623,15 @@ static void mfc_handle_frame(struct s5p_mfc_ctx *ctx, s5p_mfc_change_state(ctx, MFCINST_RES_CHANGE_FLUSH); if (res_change) { - mfc_debug(2, "Resolution change set to %d\n", res_change); + mfc_debug(2, "[DRC] Resolution change set to %d\n", res_change); s5p_mfc_change_state(ctx, MFCINST_RES_CHANGE_INIT); ctx->wait_state = WAIT_DECODING; - mfc_debug(2, "Decoding waiting! : %d\n", ctx->wait_state); + mfc_debug(7, "[DRC] Decoding waiting! : %d\n", ctx->wait_state); return; } if (need_dpb_change || need_scratch_change) - mfc_debug(2, "Interframe resolution change is not supported\n"); + mfc_debug(2, "[DRC] Interframe resolution change is not supported\n"); if (s5p_mfc_is_queue_count_same(&ctx->buf_queue_lock, &ctx->src_buf_queue, 0) && s5p_mfc_is_queue_count_same(&ctx->buf_queue_lock, &ctx->dst_buf_queue, 0)) { @@ -656,7 +656,7 @@ static void mfc_handle_frame(struct s5p_mfc_ctx *ctx, if (ctx->state == MFCINST_RES_CHANGE_FLUSH) { struct mfc_timestamp *temp_ts = NULL; - mfc_debug(2, "Last frame received after resolution change.\n"); + mfc_debug(2, "[DRC] Last frame received after resolution change.\n"); mfc_handle_frame_all_extracted(ctx); s5p_mfc_change_state(ctx, MFCINST_RES_CHANGE_END); /* If there is no display frame after resolution change, @@ -1175,7 +1175,7 @@ static int mfc_handle_seq_enc(struct s5p_mfc_ctx *ctx) s5p_mfc_clear_roi_enable(dev); if (!ctx->codec_buffer_allocated) { - mfc_debug(2, "previous codec buffer is exist\n"); + mfc_debug(2, "[DRC] previous codec buffer is exist\n"); if (dev->has_mmcache && dev->mmcache.is_on_status) s5p_mfc_invalidate_mmcache(dev); 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 01ee26160614..05a52897933b 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c @@ -1512,15 +1512,15 @@ void mfc_nal_q_handle_frame(struct s5p_mfc_ctx *ctx, DecoderOutputStr *pOutStr) dec->dynamic_used, pOutStr->UsedDpbFlagLower); if (ctx->state == MFCINST_RES_CHANGE_INIT) { - mfc_debug(2, "NAL Q: return until NAL-Q stopped in try_run\n"); + mfc_debug(2, "NAL Q:[DRC] return until NAL-Q stopped in try_run\n"); goto leave_handle_frame; } if (res_change) { - mfc_debug(2, "NAL Q: Resolution change set to %d\n", res_change); + mfc_debug(2, "NAL Q:[DRC] Resolution change set to %d\n", res_change); s5p_mfc_change_state(ctx, MFCINST_RES_CHANGE_INIT); ctx->wait_state = WAIT_DECODING; dev->nal_q_handle->nal_q_exception = 1; - mfc_info_ctx("NAL Q: nal_q_exception is set (res change)\n"); + mfc_info_ctx("NAL Q:[DRC] nal_q_exception is set (res change)\n"); goto leave_handle_frame; } if (need_empty_dpb) { @@ -1531,9 +1531,9 @@ void mfc_nal_q_handle_frame(struct s5p_mfc_ctx *ctx, DecoderOutputStr *pOutStr) goto leave_handle_frame; } if (need_dpb_change || need_scratch_change) { - mfc_debug(2, "NAL Q: Interframe resolution change is not supported\n"); + mfc_debug(2, "NAL Q:[DRC] Interframe resolution change is not supported\n"); dev->nal_q_handle->nal_q_exception = 1; - mfc_info_ctx("NAL Q: nal_q_exception is set (interframe res change)\n"); + mfc_info_ctx("NAL Q:[DRC] nal_q_exception is set (interframe res change)\n"); goto leave_handle_frame; } if (is_interlaced) {