From: Ayoung Sim Date: Fri, 15 Jun 2018 08:20:28 +0000 (+0900) Subject: [COMMON] media: mfc: DRV4.0: update prefix [HIERARCHICAL] X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=88c74a51f29e9b7efd8b319f083f30c996898c7b;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [COMMON] media: mfc: DRV4.0: update prefix [HIERARCHICAL] Change-Id: If14197adfdc77bd9f10382c9fa80a0d41196d5c1 Signed-off-by: Ayoung Sim --- 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 cc34ea73fc16..8733e2588d61 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_ops.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_enc_ops.c @@ -1021,7 +1021,7 @@ static void mfc_enc_set_buf_ctrls_temporal_svc(struct s5p_mfc_ctx *ctx, value = MFC_READL(buf_ctrl->flag_addr); value &= ~(1 << 10); MFC_WRITEL(value, buf_ctrl->flag_addr); - mfc_err_ctx("Temporal SVC: layer count is invalid : %d\n", + mfc_err_ctx("[HIERARCHICAL] layer count is invalid : %d\n", temporal_LC.temporal_layer_count); return; } @@ -1039,7 +1039,7 @@ static void mfc_enc_set_buf_ctrls_temporal_svc(struct s5p_mfc_ctx *ctx, value &= ~(1 << 2); MFC_WRITEL(value, buf_ctrl->flag_addr); - mfc_debug(3, "Temporal SVC: layer count %d, E_PARAM_CHANGE %#x\n", + mfc_debug(3, "[HIERARCHICAL] layer count %d, E_PARAM_CHANGE %#x\n", temporal_LC.temporal_layer_count & 0x7, value); value = MFC_READL(S5P_FIMV_E_NUM_T_LAYER); @@ -1049,9 +1049,9 @@ static void mfc_enc_set_buf_ctrls_temporal_svc(struct s5p_mfc_ctx *ctx, value &= ~(0x1 << 8); value |= (p->hier_bitrate_ctrl & 0x1) << 8; MFC_WRITEL(value, S5P_FIMV_E_NUM_T_LAYER); - mfc_debug(3, "Temporal SVC: E_NUM_T_LAYER %#x\n", value); + mfc_debug(3, "[HIERARCHICAL] E_NUM_T_LAYER %#x\n", value); for (i = 0; i < (temporal_LC.temporal_layer_count & 0x7); i++) { - mfc_debug(3, "Temporal SVC: layer bitrate[%d] %d (FW ctrl: %d)\n", + mfc_debug(3, "[HIERARCHICAL] layer bitrate[%d] %d (FW ctrl: %d)\n", i, temporal_LC.temporal_layer_bitrate[i], p->hier_bitrate_ctrl); MFC_WRITEL(temporal_LC.temporal_layer_bitrate[i], buf_ctrl->addr + i * 4); @@ -1070,13 +1070,13 @@ static void mfc_enc_set_buf_ctrls_temporal_svc(struct s5p_mfc_ctx *ctx, } MFC_WRITEL(value, S5P_FIMV_E_H264_HD_SVC_EXTENSION_0); MFC_WRITEL(value2, S5P_FIMV_E_H264_HD_SVC_EXTENSION_1); - mfc_debug(3, "Temporal SVC: EXTENSION0 %#x, EXTENSION1 %#x\n", + mfc_debug(3, "[HIERARCHICAL] EXTENSION0 %#x, EXTENSION1 %#x\n", value, value2); value = MFC_READL(buf_ctrl->flag_addr); value |= (1 << 12); MFC_WRITEL(value, buf_ctrl->flag_addr); - mfc_debug(3, "Temporal SVC: E_PARAM_CHANGE %#x\n", value); + mfc_debug(3, "[HIERARCHICAL] E_PARAM_CHANGE %#x\n", value); } } @@ -1098,7 +1098,7 @@ static void mfc_enc_set_buf_ctrls_temporal_svc(struct s5p_mfc_ctx *ctx, MFC_WRITEL(value, S5P_FIMV_E_H264_HD_SVC_EXTENSION_0); MFC_WRITEL(value2, S5P_FIMV_E_H264_HD_SVC_EXTENSION_1); p->codec.h264.base_priority = buf_ctrl->val; - mfc_debug(3, "Temporal SVC: EXTENSION0 %#x, EXTENSION1 %#x\n", + mfc_debug(3, "[HIERARCHICAL] EXTENSION0 %#x, EXTENSION1 %#x\n", value, value2); } } @@ -1354,7 +1354,7 @@ static int s5p_mfc_enc_set_buf_ctrls_val_nal_q_enc(struct s5p_mfc_ctx *ctx, ((temporal_LC.temporal_layer_count > 3) && IS_VP8_ENC(ctx)) || ((temporal_LC.temporal_layer_count > 3) && IS_VP9_ENC(ctx))) { /* claer NUM_T_LAYER_CHANGE */ - mfc_err_ctx("Temporal SVC: layer count(%d) is invalid\n", + mfc_err_ctx("[HIERARCHICAL] layer count(%d) is invalid\n", temporal_LC.temporal_layer_count); return 0; } @@ -1374,7 +1374,7 @@ static int s5p_mfc_enc_set_buf_ctrls_val_nal_q_enc(struct s5p_mfc_ctx *ctx, pInStr->ParamChange |= (1 << 10); else pInStr->ParamChange &= ~(1 << 10); - mfc_debug(3, "Temporal SVC layer count %d\n", + mfc_debug(3, "[HIERARCHICAL] layer count %d\n", temporal_LC.temporal_layer_count & 0x7); pInStr->NumTLayer &= ~(0x7); @@ -1382,7 +1382,7 @@ static int s5p_mfc_enc_set_buf_ctrls_val_nal_q_enc(struct s5p_mfc_ctx *ctx, pInStr->NumTLayer &= ~(0x1 << 8); pInStr->NumTLayer |= (p->hier_bitrate_ctrl & 0x1) << 8; for (i = 0; i < (temporal_LC.temporal_layer_count & 0x7); i++) { - mfc_debug(3, "Temporal SVC: layer bitrate[%d] %d (FW ctrl: %d)\n", + mfc_debug(3, "[HIERARCHICAL] layer bitrate[%d] %d (FW ctrl: %d)\n", i, temporal_LC.temporal_layer_bitrate[i], p->hier_bitrate_ctrl); pInStr->HierarchicalBitRateLayer[i] = temporal_LC.temporal_layer_bitrate[i]; @@ -1398,7 +1398,7 @@ static int s5p_mfc_enc_set_buf_ctrls_val_nal_q_enc(struct s5p_mfc_ctx *ctx, pInStr->H264HDSvcExtension1 |= ((p->codec.h264.base_priority & 0x3f) + i) << (6 * (i - 5)); } - mfc_debug(3, "NAL-Q: Temporal SVC: EXTENSION0 %#x, EXTENSION1 %#x\n", + mfc_debug(3, "NAL-Q:[HIERARCHICAL] EXTENSION0 %#x, EXTENSION1 %#x\n", pInStr->H264HDSvcExtension0, pInStr->H264HDSvcExtension1); pInStr->ParamChange |= (1 << 12); 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 81c07f8f5b99..faa1f65550df 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_param.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_enc_param.c @@ -297,7 +297,7 @@ static void mfc_set_temporal_svc_h264(struct s5p_mfc_ctx *ctx, struct s5p_mfc_h2 reg &= ~(0x1 << 8); reg |= (p->hier_bitrate_ctrl & 0x1) << 8; MFC_WRITEL(reg, S5P_FIMV_E_NUM_T_LAYER); - mfc_debug(3, "Temporal SVC: hier_qp_enable %d, enable_ltr %d, " + mfc_debug(3, "[HIERARCHICAL] hier_qp_enable %d, enable_ltr %d, " "num_hier_layer %d, max_layer %d, hier_ref_type %d, NUM_T_LAYER 0x%x\n", p_264->hier_qp_enable, p_264->enable_ltr, p_264->num_hier_layer, p->num_hier_max_layer, p_264->hier_ref_type, reg); @@ -308,7 +308,7 @@ static void mfc_set_temporal_svc_h264(struct s5p_mfc_ctx *ctx, struct s5p_mfc_h2 /* If hier_bitrate_ctrl is set to 1, this is meaningless */ MFC_WRITEL(p_264->hier_bit_layer[i], S5P_FIMV_E_HIERARCHICAL_BIT_RATE_LAYER0 + i * 4); - mfc_debug(3, "Temporal SVC: layer[%d] QP: %#x, bitrate: %d(FW ctrl: %d)\n", + mfc_debug(3, "[HIERARCHICAL] layer[%d] QP: %#x, bitrate: %d(FW ctrl: %d)\n", i, p_264->hier_qp_layer[i], p_264->hier_bit_layer[i], p->hier_bitrate_ctrl); } @@ -323,7 +323,7 @@ static void mfc_set_temporal_svc_h264(struct s5p_mfc_ctx *ctx, struct s5p_mfc_h2 } MFC_WRITEL(reg, S5P_FIMV_E_H264_HD_SVC_EXTENSION_0); MFC_WRITEL(reg2, S5P_FIMV_E_H264_HD_SVC_EXTENSION_1); - mfc_debug(3, "Temporal SVC: priority EXTENSION0: %#x, EXTENSION1: %#x\n", + mfc_debug(3, "[HIERARCHICAL] priority EXTENSION0: %#x, EXTENSION1: %#x\n", reg, reg2); } } @@ -838,7 +838,7 @@ void s5p_mfc_set_enc_params_vp8(struct s5p_mfc_ctx *ctx) reg &= ~(0x1 << 8); reg |= (p->hier_bitrate_ctrl & 0x1) << 8; MFC_WRITEL(reg, S5P_FIMV_E_NUM_T_LAYER); - mfc_debug(3, "Temporal SVC: hier_qp_enable %d, num_hier_layer %d, NUM_T_LAYER 0x%x\n", + mfc_debug(3, "[HIERARCHICAL] hier_qp_enable %d, num_hier_layer %d, NUM_T_LAYER 0x%x\n", p_vp8->hier_qp_enable, p_vp8->num_hier_layer, reg); /* QP & Bitrate for each layer */ @@ -848,7 +848,7 @@ void s5p_mfc_set_enc_params_vp8(struct s5p_mfc_ctx *ctx) /* If hier_bitrate_ctrl is set to 1, this is meaningless */ MFC_WRITEL(p_vp8->hier_bit_layer[i], S5P_FIMV_E_HIERARCHICAL_BIT_RATE_LAYER0 + i * 4); - mfc_debug(3, "Temporal SVC: layer[%d] QP: %#x, bitrate: %#x(FW ctrl: %d)\n", + mfc_debug(3, "[HIERARCHICAL] layer[%d] QP: %#x, bitrate: %#x(FW ctrl: %d)\n", i, p_vp8->hier_qp_layer[i], p_vp8->hier_bit_layer[i], p->hier_bitrate_ctrl); } @@ -987,7 +987,7 @@ void s5p_mfc_set_enc_params_vp9(struct s5p_mfc_ctx *ctx) reg &= ~(0x1 << 8); reg |= (p->hier_bitrate_ctrl & 0x1) << 8; MFC_WRITEL(reg, S5P_FIMV_E_NUM_T_LAYER); - mfc_debug(3, "Temporal SVC: hier_qp_enable %d, num_hier_layer %d, NUM_T_LAYER 0x%x\n", + mfc_debug(3, "[HIERARCHICAL] hier_qp_enable %d, num_hier_layer %d, NUM_T_LAYER 0x%x\n", p_vp9->hier_qp_enable, p_vp9->num_hier_layer, reg); /* QP & Bitrate for each layer */ @@ -997,7 +997,7 @@ void s5p_mfc_set_enc_params_vp9(struct s5p_mfc_ctx *ctx) /* If hier_bitrate_ctrl is set to 1, this is meaningless */ MFC_WRITEL(p_vp9->hier_bit_layer[i], S5P_FIMV_E_HIERARCHICAL_BIT_RATE_LAYER0 + i * 4); - mfc_debug(3, "Temporal SVC: layer[%d] QP: %#x, bitrate: %#x (FW ctrl: %d)\n", + mfc_debug(3, "[HIERARCHICAL] layer[%d] QP: %#x, bitrate: %#x (FW ctrl: %d)\n", i, p_vp9->hier_qp_layer[i], p_vp9->hier_bit_layer[i], p->hier_bitrate_ctrl); } @@ -1218,7 +1218,7 @@ void s5p_mfc_set_enc_params_hevc(struct s5p_mfc_ctx *ctx) reg &= ~(0x1 << 8); reg |= (p->hier_bitrate_ctrl & 0x1) << 8; MFC_WRITEL(reg, S5P_FIMV_E_NUM_T_LAYER); - mfc_debug(2, "Temporal SVC: hier_qp_enable %d, enable_ltr %d, " + mfc_debug(3, "[HIERARCHICAL] hier_qp_enable %d, enable_ltr %d, " "num_hier_layer %d, max_layer %d, hier_ref_type %d, NUM_T_LAYER 0x%x\n", p_hevc->hier_qp_enable, p_hevc->enable_ltr, p_hevc->num_hier_layer, p->num_hier_max_layer, p_hevc->hier_ref_type, reg); @@ -1229,7 +1229,7 @@ void s5p_mfc_set_enc_params_hevc(struct s5p_mfc_ctx *ctx) S5P_FIMV_E_HIERARCHICAL_QP_LAYER0 + i * 4); MFC_WRITEL(p_hevc->hier_bit_layer[i], S5P_FIMV_E_HIERARCHICAL_BIT_RATE_LAYER0 + i * 4); - mfc_debug(3, "Temporal SVC: layer[%d] QP: %#x, bitrate: %d(FW ctrl: %d)\n", + mfc_debug(3, "[HIERARCHICAL] layer[%d] QP: %#x, bitrate: %d(FW ctrl: %d)\n", i, p_hevc->hier_qp_layer[i], p_hevc->hier_bit_layer[i], p->hier_bitrate_ctrl); }