diff --git a/driver/platform/kalama/inc/kalama_technology.h b/driver/platform/kalama/inc/kalama_technology.h index 5e0dcdee82..a43b7d3df8 100644 --- a/driver/platform/kalama/inc/kalama_technology.h +++ b/driver/platform/kalama/inc/kalama_technology.h @@ -226,7 +226,7 @@ static u32 av1_num_tiles_kalama[7][3] = { * * Total W = SUMPRODUCT(H16:J16, K16 : M16) / SUM(H16:J16) * Total R = SUMPRODUCT(H16:J16, N16 : P16) / SUM(H16:J16) -*/ + */ /* 1000x */ static u32 kalama_en_readfactor[7] = {1000, 1500, 1750, 1875, 1000, 2000, 2000}; diff --git a/driver/platform/kalama/src/msm_vidc_kalama.c b/driver/platform/kalama/src/msm_vidc_kalama.c index ba2e65eb55..63789f49ad 100644 --- a/driver/platform/kalama/src/msm_vidc_kalama.c +++ b/driver/platform/kalama/src/msm_vidc_kalama.c @@ -290,11 +290,12 @@ static struct msm_platform_core_capability core_data_kalama[] = { {MAX_SECURE_SESSION_COUNT, 3}, {MAX_RT_MBPF, 174080}, /* (8192x4352)/256 + (4096x2176)/256*/ {MAX_MBPF, 278528}, /* ((8192x4352)/256) * 2 */ - {MAX_MBPS, 7833600}, /* max_load - * 7680x4320@60fps or 3840x2176@240fps - * which is greater than 4096x2176@120fps, - * 8192x4320@48fps - */ + {MAX_MBPS, 7833600}, + /* max_load + * 7680x4320@60fps or 3840x2176@240fps + * which is greater than 4096x2176@120fps, + * 8192x4320@48fps + */ {MAX_IMAGE_MBPF, 1048576}, /* (16384x16384)/256 */ {MAX_MBPF_HQ, 8160}, /* ((1920x1088)/256) */ {MAX_MBPS_HQ, 489600}, /* ((1920x1088)/256)@60fps */ diff --git a/driver/platform/pineapple/src/msm_vidc_pineapple.c b/driver/platform/pineapple/src/msm_vidc_pineapple.c index dea8ac5102..423b64fd8b 100644 --- a/driver/platform/pineapple/src/msm_vidc_pineapple.c +++ b/driver/platform/pineapple/src/msm_vidc_pineapple.c @@ -292,11 +292,12 @@ static struct msm_platform_core_capability core_data_pineapple[] = { {MAX_SECURE_SESSION_COUNT, 3}, {MAX_RT_MBPF, 174080}, /* (8192x4352)/256 + (4096x2176)/256*/ {MAX_MBPF, 278528}, /* ((8192x4352)/256) * 2 */ - {MAX_MBPS, 7833600}, /* max_load - * 7680x4320@60fps or 3840x2176@240fps - * which is greater than 4096x2176@120fps, - * 8192x4320@48fps - */ + {MAX_MBPS, 7833600}, + /* max_load + * 7680x4320@60fps or 3840x2176@240fps + * which is greater than 4096x2176@120fps, + * 8192x4320@48fps + */ {MAX_IMAGE_MBPF, 1048576}, /* (16384x16384)/256 */ {MAX_MBPF_HQ, 8160}, /* ((1920x1088)/256) */ {MAX_MBPS_HQ, 489600}, /* ((1920x1088)/256)@60fps */ diff --git a/driver/platform/pineapple/src/pineapple.c b/driver/platform/pineapple/src/pineapple.c index 3274f82bbf..d8f024871f 100644 --- a/driver/platform/pineapple/src/pineapple.c +++ b/driver/platform/pineapple/src/pineapple.c @@ -196,11 +196,12 @@ static struct msm_platform_core_capability core_data_pineapple[] = { {MAX_NUM_8K_SESSIONS, 2}, {MAX_RT_MBPF, 174080}, /* (8192x4352)/256 + (4096x2176)/256*/ {MAX_MBPF, 278528}, /* ((8192x4352)/256) * 2 */ - {MAX_MBPS, 7833600}, /* max_load - * 7680x4320@60fps or 3840x2176@240fps - * which is greater than 4096x2176@120fps, - * 8192x4320@48fps - */ + {MAX_MBPS, 7833600}, + /* max_load + * 7680x4320@60fps or 3840x2176@240fps + * which is greater than 4096x2176@120fps, + * 8192x4320@48fps + */ {MAX_MBPF_HQ, 8160}, /* ((1920x1088)/256) */ {MAX_MBPS_HQ, 489600}, /* ((1920x1088)/256)@60fps */ {MAX_MBPF_B_FRAME, 32640}, /* 3840x2176/256 */ diff --git a/driver/variant/iris2/src/msm_vidc_iris2.c b/driver/variant/iris2/src/msm_vidc_iris2.c index fb5de0d510..614cc18809 100644 --- a/driver/variant/iris2/src/msm_vidc_iris2.c +++ b/driver/variant/iris2/src/msm_vidc_iris2.c @@ -674,7 +674,7 @@ static int __noc_error_info_iris2(struct msm_vidc_core *core) d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_LOW: %#x\n", val); val = __read_register(core, VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH); d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH: %#x\n", val); - */ + */ return 0; } diff --git a/driver/variant/iris3/inc/hfi_buffer_iris3.h b/driver/variant/iris3/inc/hfi_buffer_iris3.h index 702665dbcd..2dce34a900 100644 --- a/driver/variant/iris3/inc/hfi_buffer_iris3.h +++ b/driver/variant/iris3/inc/hfi_buffer_iris3.h @@ -1072,7 +1072,8 @@ _yuv_bufcount_min, is_opb, num_vpp_pipes) \ #define AV1_CABAC_HDR_RATIO_HD_TOT 2 #define AV1_CABAC_RES_RATIO_HD_TOT 2 /* some content need more bin buffer, - * but limit buffer size for high resolution */ + * but limit buffer size for high resolution + */ #define SIZE_AV1D_HW_BIN_BUFFER(_size, frame_width, frame_height, delay, \ num_vpp_pipes) \ do { \ diff --git a/driver/variant/iris3/src/msm_vidc_iris3.c b/driver/variant/iris3/src/msm_vidc_iris3.c index b60fc376b1..1ab47a281b 100644 --- a/driver/variant/iris3/src/msm_vidc_iris3.c +++ b/driver/variant/iris3/src/msm_vidc_iris3.c @@ -721,7 +721,7 @@ static int __noc_error_info_iris3(struct msm_vidc_core *core) d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_LOW: %#x\n", val); val = __read_register(core, VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH); d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH: %#x\n", val); - */ + */ return 0; } @@ -977,7 +977,7 @@ int msm_vidc_adjust_bitrate_boost_iris3(void *instance, struct v4l2_ctrl *ctrl) * honor client set bitrate boost * if client did not set, keep max bitrate boost upto 4k@60fps * and remove bitrate boost after 4k@60fps - */ + */ if (inst->capabilities[BITRATE_BOOST].flags & CAP_FLAG_CLIENT_SET) { /* accept client set bitrate boost value as is */ } else { diff --git a/driver/variant/iris33/inc/hfi_buffer_iris33.h b/driver/variant/iris33/inc/hfi_buffer_iris33.h index afbcc4f415..57784fb70c 100644 --- a/driver/variant/iris33/inc/hfi_buffer_iris33.h +++ b/driver/variant/iris33/inc/hfi_buffer_iris33.h @@ -1072,7 +1072,8 @@ _yuv_bufcount_min, is_opb, num_vpp_pipes) \ #define AV1_CABAC_HDR_RATIO_HD_TOT 2 #define AV1_CABAC_RES_RATIO_HD_TOT 2 /* some content need more bin buffer, - * but limit buffer size for high resolution */ + * but limit buffer size for high resolution + */ #define SIZE_AV1D_HW_BIN_BUFFER(_size, frame_width, frame_height, delay, \ num_vpp_pipes) \ do { \ diff --git a/driver/variant/iris33/src/msm_vidc_iris33.c b/driver/variant/iris33/src/msm_vidc_iris33.c index 03eca21513..ca9cab269a 100644 --- a/driver/variant/iris33/src/msm_vidc_iris33.c +++ b/driver/variant/iris33/src/msm_vidc_iris33.c @@ -916,7 +916,7 @@ static int __noc_error_info_iris33(struct msm_vidc_core *core) d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_LOW: %#x\n", val); val = __read_register(core, VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH); d_vpr_e("VCODEC_NOC_ERL_MAIN_ERRLOG3_HIGH: %#x\n", val); - */ + */ if (is_iris33_hw_power_collapsed(core)) { d_vpr_e("%s: video hardware already power collapsed\n", __func__); @@ -1258,7 +1258,7 @@ int msm_vidc_adjust_bitrate_boost_iris33(void *instance, struct v4l2_ctrl *ctrl) * honor client set bitrate boost * if client did not set, keep max bitrate boost upto 4k@60fps * and remove bitrate boost after 4k@60fps - */ + */ if (inst->capabilities[BITRATE_BOOST].flags & CAP_FLAG_CLIENT_SET) { /* accept client set bitrate boost value as is */ } else { diff --git a/driver/vidc/src/msm_vdec.c b/driver/vidc/src/msm_vdec.c index 57ef990d14..73753beb45 100644 --- a/driver/vidc/src/msm_vdec.c +++ b/driver/vidc/src/msm_vdec.c @@ -310,7 +310,7 @@ static int msm_vdec_set_cabac(struct msm_vidc_inst *inst, return rc; } -*/ + */ static int msm_vdec_set_coded_frames(struct msm_vidc_inst *inst, enum msm_vidc_port_type port) { @@ -1197,12 +1197,12 @@ static int msm_vdec_set_delivery_mode_property(struct msm_vidc_inst *inst, if (is_meta_rx_inp_enabled(inst, META_OUTBUF_FENCE)) { /* - * if output buffer fence enabled via - * META_OUTBUF_FENCE, then driver will send - * fence id via HFI_PROP_FENCE to firmware. - * So enable HFI_PROP_FENCE property as - * delivery mode property. - */ + * if output buffer fence enabled via + * META_OUTBUF_FENCE, then driver will send + * fence id via HFI_PROP_FENCE to firmware. + * So enable HFI_PROP_FENCE property as + * delivery mode property. + */ payload[++count] = inst->capabilities[property_output_list[i]].hfi_id; } diff --git a/driver/vidc/src/msm_vidc_buffer.c b/driver/vidc/src/msm_vidc_buffer.c index 4d51e0ee61..65ae24e4c2 100644 --- a/driver/vidc/src/msm_vidc_buffer.c +++ b/driver/vidc/src/msm_vidc_buffer.c @@ -382,10 +382,12 @@ u32 msm_vidc_encoder_output_size(struct msm_vidc_inst *inst) frame_size = frame_size << 1; if (inst->rc_type == RATE_CONTROL_LOSSLESS) - frame_size = (width * height * 9) >> 2; */ + frame_size = (width * height * 9) >> 2; + */ skip_calc: - /* multiply by 10/8 (1.25) to get size for 10 bit case */ + /* multiply by 10/8 (1.25) to get size for 10 bit case + */ if (codec == MSM_VIDC_HEVC || codec == MSM_VIDC_HEIC) frame_size = frame_size + (frame_size >> 2);