diff --git a/driver/variant/iris2/inc/msm_vidc_power_iris2.h b/driver/variant/iris2/inc/msm_vidc_power_iris2.h index e55ca5cc33..01f04627bc 100644 --- a/driver/variant/iris2/inc/msm_vidc_power_iris2.h +++ b/driver/variant/iris2/inc/msm_vidc_power_iris2.h @@ -10,8 +10,8 @@ #include "msm_vidc_inst.h" #include "msm_vidc_power.h" -u64 msm_vidc_calc_freq_iris2(struct msm_vidc_inst* inst, u32 data_size); -int msm_vidc_calc_bw_iris2(struct msm_vidc_inst* inst, - struct vidc_bus_vote_data* vote_data); +u64 msm_vidc_calc_freq_iris2(struct msm_vidc_inst *inst, u32 data_size); +int msm_vidc_calc_bw_iris2(struct msm_vidc_inst *inst, + struct vidc_bus_vote_data *vote_data); #endif diff --git a/driver/variant/iris2/src/msm_vidc_buffer_iris2.c b/driver/variant/iris2/src/msm_vidc_buffer_iris2.c index dd9bac7de8..371ec666a6 100644 --- a/driver/variant/iris2/src/msm_vidc_buffer_iris2.c +++ b/driver/variant/iris2/src/msm_vidc_buffer_iris2.c @@ -54,11 +54,11 @@ static u32 msm_vidc_decoder_bin_size_iris2(struct msm_vidc_inst *inst) return size; } -static u32 msm_vidc_decoder_comv_size_iris2(struct msm_vidc_inst* inst) +static u32 msm_vidc_decoder_comv_size_iris2(struct msm_vidc_inst *inst) { u32 size = 0; u32 width, height, out_min_count, vpp_delay; - struct v4l2_format* f; + struct v4l2_format *f; f = &inst->fmts[INPUT_PORT]; width = f->fmt.pix_mp.width; @@ -79,12 +79,12 @@ static u32 msm_vidc_decoder_comv_size_iris2(struct msm_vidc_inst* inst) return size; } -static u32 msm_vidc_decoder_non_comv_size_iris2(struct msm_vidc_inst* inst) +static u32 msm_vidc_decoder_non_comv_size_iris2(struct msm_vidc_inst *inst) { u32 size = 0; u32 width, height, num_vpp_pipes; - struct msm_vidc_core* core; - struct v4l2_format* f; + struct msm_vidc_core *core; + struct v4l2_format *f; core = inst->core; @@ -269,11 +269,11 @@ static u32 msm_vidc_get_recon_buf_count(struct msm_vidc_inst *inst) return num_buf_recon; } -static u32 msm_vidc_encoder_comv_size_iris2(struct msm_vidc_inst* inst) +static u32 msm_vidc_encoder_comv_size_iris2(struct msm_vidc_inst *inst) { u32 size = 0; u32 width, height, num_recon = 0; - struct v4l2_format* f; + struct v4l2_format *f; f = &inst->fmts[OUTPUT_PORT]; width = f->fmt.pix_mp.width; @@ -289,12 +289,12 @@ static u32 msm_vidc_encoder_comv_size_iris2(struct msm_vidc_inst* inst) return size; } -static u32 msm_vidc_encoder_non_comv_size_iris2(struct msm_vidc_inst* inst) +static u32 msm_vidc_encoder_non_comv_size_iris2(struct msm_vidc_inst *inst) { - struct msm_vidc_core* core; + struct msm_vidc_core *core; u32 size = 0; u32 width, height, num_vpp_pipes; - struct v4l2_format* f; + struct v4l2_format *f; core = inst->core; @@ -371,13 +371,13 @@ static u32 msm_vidc_encoder_arp_size_iris2(struct msm_vidc_inst *inst) return size; } -static u32 msm_vidc_encoder_vpss_size_iris2(struct msm_vidc_inst* inst) +static u32 msm_vidc_encoder_vpss_size_iris2(struct msm_vidc_inst *inst) { u32 size = 0; bool ds_enable = false, is_tenbit = false, blur = false; u32 rotation_val = HFI_ROTATION_NONE; u32 width, height, driver_colorfmt; - struct v4l2_format* f; + struct v4l2_format *f; ds_enable = is_scaling_enabled(inst); msm_vidc_v4l2_to_hfi_enum(inst, ROTATION, &rotation_val); @@ -479,7 +479,7 @@ exit: return size; } -static int msm_vidc_input_min_count_iris2(struct msm_vidc_inst* inst) +static int msm_vidc_input_min_count_iris2(struct msm_vidc_inst *inst) { u32 input_min_count = 0; u32 total_hb_layer = 0; diff --git a/driver/variant/iris2/src/msm_vidc_iris2.c b/driver/variant/iris2/src/msm_vidc_iris2.c index c478b7ff9d..cd177477e0 100644 --- a/driver/variant/iris2/src/msm_vidc_iris2.c +++ b/driver/variant/iris2/src/msm_vidc_iris2.c @@ -808,7 +808,7 @@ static int __boot_firmware_iris2(struct msm_vidc_core *vidc_core) return rc; } -int msm_vidc_decide_work_mode_iris2(struct msm_vidc_inst* inst) +int msm_vidc_decide_work_mode_iris2(struct msm_vidc_inst *inst) { u32 work_mode; struct v4l2_format *inp_f; @@ -861,10 +861,10 @@ exit: return 0; } -int msm_vidc_decide_work_route_iris2(struct msm_vidc_inst* inst) +int msm_vidc_decide_work_route_iris2(struct msm_vidc_inst *inst) { u32 work_route; - struct msm_vidc_core* core; + struct msm_vidc_core *core; core = inst->core; work_route = core->capabilities[NUM_VPP_PIPE].value; @@ -939,7 +939,7 @@ int msm_vidc_adjust_blur_type_iris2(void *instance, struct v4l2_ctrl *ctrl) return 0; } -int msm_vidc_decide_quality_mode_iris2(struct msm_vidc_inst* inst) +int msm_vidc_decide_quality_mode_iris2(struct msm_vidc_inst *inst) { struct msm_vidc_core *core; u32 mbpf, mbps, max_hq_mbpf, max_hq_mbps; diff --git a/driver/variant/iris2/src/msm_vidc_power_iris2.c b/driver/variant/iris2/src/msm_vidc_power_iris2.c index be3697fcaa..a66902e00b 100644 --- a/driver/variant/iris2/src/msm_vidc_power_iris2.c +++ b/driver/variant/iris2/src/msm_vidc_power_iris2.c @@ -13,7 +13,7 @@ u64 msm_vidc_calc_freq_iris2(struct msm_vidc_inst *inst, u32 data_size) { u64 freq = 0; - struct msm_vidc_core* core; + struct msm_vidc_core *core; u64 vsp_cycles = 0, vpp_cycles = 0, fw_cycles = 0; u64 fw_vpp_cycles = 0, bitrate = 0; u32 vpp_cycles_per_mb; @@ -674,7 +674,7 @@ static u64 __calculate_encoder(struct vidc_bus_vote_data *d) return ret; } -static u64 __calculate(struct msm_vidc_inst* inst, struct vidc_bus_vote_data *d) +static u64 __calculate(struct msm_vidc_inst *inst, struct vidc_bus_vote_data *d) { u64 value = 0; diff --git a/driver/variant/iris3/inc/msm_vidc_power_iris3.h b/driver/variant/iris3/inc/msm_vidc_power_iris3.h index b994e92666..e0a5cbcd39 100644 --- a/driver/variant/iris3/inc/msm_vidc_power_iris3.h +++ b/driver/variant/iris3/inc/msm_vidc_power_iris3.h @@ -12,8 +12,8 @@ #define ENABLE_LEGACY_POWER_CALCULATIONS 0 -u64 msm_vidc_calc_freq_iris3(struct msm_vidc_inst* inst, u32 data_size); -int msm_vidc_calc_bw_iris3(struct msm_vidc_inst* inst, - struct vidc_bus_vote_data* vote_data); +u64 msm_vidc_calc_freq_iris3(struct msm_vidc_inst *inst, u32 data_size); +int msm_vidc_calc_bw_iris3(struct msm_vidc_inst *inst, + struct vidc_bus_vote_data *vote_data); #endif diff --git a/driver/variant/iris3/src/msm_vidc_buffer_iris3.c b/driver/variant/iris3/src/msm_vidc_buffer_iris3.c index 4d69beb044..be045c692d 100644 --- a/driver/variant/iris3/src/msm_vidc_buffer_iris3.c +++ b/driver/variant/iris3/src/msm_vidc_buffer_iris3.c @@ -56,7 +56,7 @@ static u32 msm_vidc_decoder_bin_size_iris3(struct msm_vidc_inst *inst) return size; } -static u32 msm_vidc_decoder_comv_size_iris3(struct msm_vidc_inst* inst) +static u32 msm_vidc_decoder_comv_size_iris3(struct msm_vidc_inst *inst) { u32 size = 0; u32 width, height, num_comv, vpp_delay; @@ -108,12 +108,12 @@ static u32 msm_vidc_decoder_comv_size_iris3(struct msm_vidc_inst* inst) return size; } -static u32 msm_vidc_decoder_non_comv_size_iris3(struct msm_vidc_inst* inst) +static u32 msm_vidc_decoder_non_comv_size_iris3(struct msm_vidc_inst *inst) { u32 size = 0; u32 width, height, num_vpp_pipes; - struct msm_vidc_core* core; - struct v4l2_format* f; + struct msm_vidc_core *core; + struct v4l2_format *f; core = inst->core; @@ -347,11 +347,11 @@ static u32 msm_vidc_get_recon_buf_count(struct msm_vidc_inst *inst) return num_buf_recon; } -static u32 msm_vidc_encoder_comv_size_iris3(struct msm_vidc_inst* inst) +static u32 msm_vidc_encoder_comv_size_iris3(struct msm_vidc_inst *inst) { u32 size = 0; u32 width, height, num_recon = 0; - struct v4l2_format* f; + struct v4l2_format *f; f = &inst->fmts[OUTPUT_PORT]; width = f->fmt.pix_mp.width; @@ -367,12 +367,12 @@ static u32 msm_vidc_encoder_comv_size_iris3(struct msm_vidc_inst* inst) return size; } -static u32 msm_vidc_encoder_non_comv_size_iris3(struct msm_vidc_inst* inst) +static u32 msm_vidc_encoder_non_comv_size_iris3(struct msm_vidc_inst *inst) { - struct msm_vidc_core* core; + struct msm_vidc_core *core; u32 size = 0; u32 width, height, num_vpp_pipes; - struct v4l2_format* f; + struct v4l2_format *f; core = inst->core; @@ -448,13 +448,13 @@ static u32 msm_vidc_encoder_arp_size_iris3(struct msm_vidc_inst *inst) return size; } -static u32 msm_vidc_encoder_vpss_size_iris3(struct msm_vidc_inst* inst) +static u32 msm_vidc_encoder_vpss_size_iris3(struct msm_vidc_inst *inst) { u32 size = 0; bool ds_enable = false, is_tenbit = false, blur = false; u32 rotation_val = HFI_ROTATION_NONE; u32 width, height, driver_colorfmt; - struct v4l2_format* f; + struct v4l2_format *f; ds_enable = is_scaling_enabled(inst); msm_vidc_v4l2_to_hfi_enum(inst, ROTATION, &rotation_val); @@ -586,7 +586,7 @@ exit: return size; } -static int msm_vidc_input_min_count_iris3(struct msm_vidc_inst* inst) +static int msm_vidc_input_min_count_iris3(struct msm_vidc_inst *inst) { u32 input_min_count = 0; u32 total_hb_layer = 0; diff --git a/driver/variant/iris3/src/msm_vidc_iris3.c b/driver/variant/iris3/src/msm_vidc_iris3.c index 976e2fedc1..60335eeded 100644 --- a/driver/variant/iris3/src/msm_vidc_iris3.c +++ b/driver/variant/iris3/src/msm_vidc_iris3.c @@ -855,7 +855,7 @@ static int __boot_firmware_iris3(struct msm_vidc_core *vidc_core) return rc; } -int msm_vidc_decide_work_mode_iris3(struct msm_vidc_inst* inst) +int msm_vidc_decide_work_mode_iris3(struct msm_vidc_inst *inst) { u32 work_mode; struct v4l2_format *inp_f; @@ -912,10 +912,10 @@ exit: return 0; } -int msm_vidc_decide_work_route_iris3(struct msm_vidc_inst* inst) +int msm_vidc_decide_work_route_iris3(struct msm_vidc_inst *inst) { u32 work_route; - struct msm_vidc_core* core; + struct msm_vidc_core *core; core = inst->core; work_route = core->capabilities[NUM_VPP_PIPE].value; @@ -948,7 +948,7 @@ exit: return 0; } -int msm_vidc_decide_quality_mode_iris3(struct msm_vidc_inst* inst) +int msm_vidc_decide_quality_mode_iris3(struct msm_vidc_inst *inst) { struct msm_vidc_core *core; u32 mbpf, mbps, max_hq_mbpf, max_hq_mbps; @@ -994,7 +994,7 @@ decision_done: return 0; } -int msm_vidc_adjust_bitrate_boost_iris3(void* instance, struct v4l2_ctrl *ctrl) +int msm_vidc_adjust_bitrate_boost_iris3(void *instance, struct v4l2_ctrl *ctrl) { s32 adjusted_value; struct msm_vidc_inst *inst = (struct msm_vidc_inst *) instance; diff --git a/driver/variant/iris3/src/msm_vidc_power_iris3.c b/driver/variant/iris3/src/msm_vidc_power_iris3.c index 3b94833cbb..bb85c20065 100644 --- a/driver/variant/iris3/src/msm_vidc_power_iris3.c +++ b/driver/variant/iris3/src/msm_vidc_power_iris3.c @@ -14,7 +14,7 @@ static u64 __calculate_decoder(struct vidc_bus_vote_data *d); static u64 __calculate_encoder(struct vidc_bus_vote_data *d); -static u64 __calculate(struct msm_vidc_inst* inst, struct vidc_bus_vote_data *d); +static u64 __calculate(struct msm_vidc_inst *inst, struct vidc_bus_vote_data *d); static u64 msm_vidc_calc_freq_iris3_legacy(struct msm_vidc_inst *inst, u32 data_size); static int msm_vidc_init_codec_input_freq(struct msm_vidc_inst *inst, u32 data_size, @@ -287,7 +287,7 @@ static int msm_vidc_init_codec_input_bus(struct msm_vidc_inst *inst, struct vidc static u64 msm_vidc_calc_freq_iris3_new(struct msm_vidc_inst *inst, u32 data_size) { u64 freq = 0; - struct msm_vidc_core* core; + struct msm_vidc_core *core; int ret = 0; struct api_calculation_input codec_input; struct api_calculation_freq_output codec_output; @@ -368,7 +368,7 @@ u64 msm_vidc_calc_freq_iris3(struct msm_vidc_inst *inst, u32 data_size) static u64 msm_vidc_calc_freq_iris3_legacy(struct msm_vidc_inst *inst, u32 data_size) { u64 freq = 0; - struct msm_vidc_core* core; + struct msm_vidc_core *core; u64 vsp_cycles = 0, vpp_cycles = 0, fw_cycles = 0; u64 fw_vpp_cycles = 0, bitrate = 0; u32 vpp_cycles_per_mb; @@ -1127,7 +1127,7 @@ static u64 __calculate_encoder(struct vidc_bus_vote_data *d) return ret; } -static u64 __calculate(struct msm_vidc_inst* inst, struct vidc_bus_vote_data *d) +static u64 __calculate(struct msm_vidc_inst *inst, struct vidc_bus_vote_data *d) { u64 value = 0; diff --git a/driver/variant/iris33/inc/msm_vidc_power_iris33.h b/driver/variant/iris33/inc/msm_vidc_power_iris33.h index ec51a7fe35..180a68e6c1 100644 --- a/driver/variant/iris33/inc/msm_vidc_power_iris33.h +++ b/driver/variant/iris33/inc/msm_vidc_power_iris33.h @@ -13,8 +13,8 @@ #define ENABLE_LEGACY_POWER_CALCULATIONS 0 int msm_vidc_ring_buf_count_iris33(struct msm_vidc_inst *inst, u32 data_size); -u64 msm_vidc_calc_freq_iris33(struct msm_vidc_inst* inst, u32 data_size); -int msm_vidc_calc_bw_iris33(struct msm_vidc_inst* inst, - struct vidc_bus_vote_data* vote_data); +u64 msm_vidc_calc_freq_iris33(struct msm_vidc_inst *inst, u32 data_size); +int msm_vidc_calc_bw_iris33(struct msm_vidc_inst *inst, + struct vidc_bus_vote_data *vote_data); #endif diff --git a/driver/variant/iris33/src/msm_vidc_buffer_iris33.c b/driver/variant/iris33/src/msm_vidc_buffer_iris33.c index b6d77771ff..07e3d19b97 100644 --- a/driver/variant/iris33/src/msm_vidc_buffer_iris33.c +++ b/driver/variant/iris33/src/msm_vidc_buffer_iris33.c @@ -56,7 +56,7 @@ static u32 msm_vidc_decoder_bin_size_iris33(struct msm_vidc_inst *inst) return size; } -static u32 msm_vidc_decoder_comv_size_iris33(struct msm_vidc_inst* inst) +static u32 msm_vidc_decoder_comv_size_iris33(struct msm_vidc_inst *inst) { u32 size = 0; u32 width, height, num_comv, vpp_delay; @@ -108,12 +108,12 @@ static u32 msm_vidc_decoder_comv_size_iris33(struct msm_vidc_inst* inst) return size; } -static u32 msm_vidc_decoder_non_comv_size_iris33(struct msm_vidc_inst* inst) +static u32 msm_vidc_decoder_non_comv_size_iris33(struct msm_vidc_inst *inst) { u32 size = 0; u32 width, height, num_vpp_pipes; - struct msm_vidc_core* core; - struct v4l2_format* f; + struct msm_vidc_core *core; + struct v4l2_format *f; core = inst->core; @@ -355,11 +355,11 @@ static u32 msm_vidc_get_recon_buf_count(struct msm_vidc_inst *inst) return num_buf_recon; } -static u32 msm_vidc_encoder_comv_size_iris33(struct msm_vidc_inst* inst) +static u32 msm_vidc_encoder_comv_size_iris33(struct msm_vidc_inst *inst) { u32 size = 0; u32 width, height, num_recon = 0; - struct v4l2_format* f; + struct v4l2_format *f; f = &inst->fmts[OUTPUT_PORT]; width = f->fmt.pix_mp.width; @@ -375,12 +375,12 @@ static u32 msm_vidc_encoder_comv_size_iris33(struct msm_vidc_inst* inst) return size; } -static u32 msm_vidc_encoder_non_comv_size_iris33(struct msm_vidc_inst* inst) +static u32 msm_vidc_encoder_non_comv_size_iris33(struct msm_vidc_inst *inst) { - struct msm_vidc_core* core; + struct msm_vidc_core *core; u32 size = 0; u32 width, height, num_vpp_pipes; - struct v4l2_format* f; + struct v4l2_format *f; core = inst->core; @@ -456,13 +456,13 @@ static u32 msm_vidc_encoder_arp_size_iris33(struct msm_vidc_inst *inst) return size; } -static u32 msm_vidc_encoder_vpss_size_iris33(struct msm_vidc_inst* inst) +static u32 msm_vidc_encoder_vpss_size_iris33(struct msm_vidc_inst *inst) { u32 size = 0; bool ds_enable = false, is_tenbit = false, blur = false; u32 rotation_val = HFI_ROTATION_NONE; u32 width, height, driver_colorfmt; - struct v4l2_format* f; + struct v4l2_format *f; ds_enable = is_scaling_enabled(inst); msm_vidc_v4l2_to_hfi_enum(inst, ROTATION, &rotation_val); @@ -594,7 +594,7 @@ exit: return size; } -static int msm_vidc_input_min_count_iris33(struct msm_vidc_inst* inst) +static int msm_vidc_input_min_count_iris33(struct msm_vidc_inst *inst) { u32 input_min_count = 0; u32 total_hb_layer = 0; diff --git a/driver/variant/iris33/src/msm_vidc_iris33.c b/driver/variant/iris33/src/msm_vidc_iris33.c index 3364d93139..1bd769e010 100644 --- a/driver/variant/iris33/src/msm_vidc_iris33.c +++ b/driver/variant/iris33/src/msm_vidc_iris33.c @@ -1104,7 +1104,7 @@ static int __boot_firmware_iris33(struct msm_vidc_core *vidc_core) return rc; } -int msm_vidc_decide_work_mode_iris33(struct msm_vidc_inst* inst) +int msm_vidc_decide_work_mode_iris33(struct msm_vidc_inst *inst) { u32 work_mode; struct v4l2_format *inp_f; @@ -1161,10 +1161,10 @@ exit: return 0; } -int msm_vidc_decide_work_route_iris33(struct msm_vidc_inst* inst) +int msm_vidc_decide_work_route_iris33(struct msm_vidc_inst *inst) { u32 work_route; - struct msm_vidc_core* core; + struct msm_vidc_core *core; core = inst->core; work_route = core->capabilities[NUM_VPP_PIPE].value; @@ -1197,7 +1197,7 @@ exit: return 0; } -int msm_vidc_decide_quality_mode_iris33(struct msm_vidc_inst* inst) +int msm_vidc_decide_quality_mode_iris33(struct msm_vidc_inst *inst) { struct msm_vidc_core *core; u32 mbpf, mbps, max_hq_mbpf, max_hq_mbps; @@ -1243,7 +1243,7 @@ decision_done: return 0; } -int msm_vidc_adjust_bitrate_boost_iris33(void* instance, struct v4l2_ctrl *ctrl) +int msm_vidc_adjust_bitrate_boost_iris33(void *instance, struct v4l2_ctrl *ctrl) { s32 adjusted_value; struct msm_vidc_inst *inst = (struct msm_vidc_inst *) instance; diff --git a/driver/variant/iris33/src/msm_vidc_power_iris33.c b/driver/variant/iris33/src/msm_vidc_power_iris33.c index bb14d8a413..812f435bc0 100644 --- a/driver/variant/iris33/src/msm_vidc_power_iris33.c +++ b/driver/variant/iris33/src/msm_vidc_power_iris33.c @@ -16,7 +16,7 @@ static u64 __calculate_decoder(struct vidc_bus_vote_data *d); static u64 __calculate_encoder(struct vidc_bus_vote_data *d); -static u64 __calculate(struct msm_vidc_inst* inst, struct vidc_bus_vote_data *d); +static u64 __calculate(struct msm_vidc_inst *inst, struct vidc_bus_vote_data *d); static u64 msm_vidc_calc_freq_iris33_legacy(struct msm_vidc_inst *inst, u32 data_size); @@ -408,7 +408,7 @@ static bool is_vpp_cycles_close_to_freq_corner(struct msm_vidc_core *core, static u64 msm_vidc_calc_freq_iris33_new(struct msm_vidc_inst *inst, u32 data_size) { u64 freq = 0; - struct msm_vidc_core* core; + struct msm_vidc_core *core; int ret = 0; struct api_calculation_input codec_input; struct api_calculation_freq_output codec_output; @@ -517,7 +517,7 @@ u64 msm_vidc_calc_freq_iris33(struct msm_vidc_inst *inst, u32 data_size) u64 msm_vidc_calc_freq_iris33_legacy(struct msm_vidc_inst *inst, u32 data_size) { u64 freq = 0; - struct msm_vidc_core* core; + struct msm_vidc_core *core; u64 vsp_cycles = 0, vpp_cycles = 0, fw_cycles = 0; u64 fw_vpp_cycles = 0, bitrate = 0; u32 vpp_cycles_per_mb; @@ -1280,7 +1280,7 @@ static u64 __calculate_encoder(struct vidc_bus_vote_data *d) return ret; } -static u64 __calculate(struct msm_vidc_inst* inst, struct vidc_bus_vote_data *d) +static u64 __calculate(struct msm_vidc_inst *inst, struct vidc_bus_vote_data *d) { u64 value = 0;