Merge "video: driver: fix alignment and blank line warning"

2023-08-03 15:08:36 -07:00
--- a/driver/platform/common/inc/msm_vidc_platform.h
+++ b/driver/platform/common/inc/msm_vidc_platform.h
@@ -161,10 +161,8 @@ struct msm_platform_inst_cap_dependency {
 	enum msm_vidc_domain_type domain;
 	enum msm_vidc_codec_type codec;
 	enum msm_vidc_inst_capability_type children[MAX_CAP_CHILDREN];
-	int (*adjust)(void *inst,
-		struct v4l2_ctrl *ctrl);
-	int (*set)(void *inst,
-		enum msm_vidc_inst_capability_type cap_id);
+	int (*adjust)(void *inst, struct v4l2_ctrl *ctrl);
+	int (*set)(void *inst, enum msm_vidc_inst_capability_type cap_id);
 };

 struct msm_vidc_compat_handle {
@@ -282,24 +280,22 @@ int msm_vidc_init_platform(struct msm_vidc_core *core);

 /* control framework support functions */

-enum msm_vidc_inst_capability_type msm_vidc_get_cap_id(
-	struct msm_vidc_inst *inst, u32 id);
+enum msm_vidc_inst_capability_type msm_vidc_get_cap_id(struct msm_vidc_inst *inst, u32 id);
 int msm_vidc_update_cap_value(struct msm_vidc_inst *inst, u32 cap,
-	s32 adjusted_val, const char *func);
-bool is_parent_available(struct msm_vidc_inst *inst,
-	u32 cap_id, u32 check_parent, const char *func);
+			      s32 adjusted_val, const char *func);
+bool is_parent_available(struct msm_vidc_inst *inst, u32 cap_id,
+			 u32 check_parent, const char *func);
 int msm_vidc_get_parent_value(struct msm_vidc_inst *inst, u32 cap, u32 parent,
-	s32 *value, const char *func);
+			      s32 *value, const char *func);
 u32 msm_vidc_get_port_info(struct msm_vidc_inst *inst,
-	enum msm_vidc_inst_capability_type cap_id);
+			   enum msm_vidc_inst_capability_type cap_id);
 int msm_vidc_v4l2_menu_to_hfi(struct msm_vidc_inst *inst,
-	enum msm_vidc_inst_capability_type cap_id, u32 *value);
+			      enum msm_vidc_inst_capability_type cap_id, u32 *value);
 int msm_vidc_v4l2_to_hfi_enum(struct msm_vidc_inst *inst,
-	enum msm_vidc_inst_capability_type cap_id, u32 *value);
+			      enum msm_vidc_inst_capability_type cap_id, u32 *value);
 int msm_vidc_packetize_control(struct msm_vidc_inst *inst,
-	enum msm_vidc_inst_capability_type cap_id, u32 payload_type,
-	void *hfi_val, u32 payload_size, const char *func);
-
+			       enum msm_vidc_inst_capability_type cap_id, u32 payload_type,
+			       void *hfi_val, u32 payload_size, const char *func);
 int msm_vidc_adjust_bitrate(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_layer_bitrate(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_bitrate_mode(void *instance, struct v4l2_ctrl *ctrl);
@@ -313,8 +309,7 @@ int msm_vidc_adjust_output_order(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_input_buf_host_max_count(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_output_buf_host_max_count(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_transform_8x8(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_chroma_qp_index_offset(void *instance,
-	struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_chroma_qp_index_offset(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_slice_count(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_layer_count(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_gop_size(void *instance, struct v4l2_ctrl *ctrl);
@@ -336,8 +331,7 @@ int msm_vidc_adjust_session_priority(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_roi_info(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_all_intra(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_dec_outbuf_fence_type(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_dec_outbuf_fence_direction(void *instance,
-	struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_dec_outbuf_fence_direction(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_dec_slice_mode(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_preprocess(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_eva_stats(void *instance, struct v4l2_ctrl *ctrl);
@@ -345,74 +339,39 @@ int msm_vidc_adjust_sei_mastering_disp(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_sei_cll(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_hdr10plus(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_transcoding_stats(void *instance, struct v4l2_ctrl *ctrl);
-
-int msm_vidc_set_header_mode(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_deblock_mode(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_min_qp(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_max_qp(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_frame_qp(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_req_sync_frame(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_chroma_qp_index_offset(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_slice_count(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_layer_count_and_type(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_gop_size(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_bitrate(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_layer_bitrate(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_u32(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_u32_packed(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_u32_enum(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_constant_quality(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_vbr_related_properties(
-	void *instance, enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_cbr_related_properties(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_use_and_mark_ltr(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_nal_length(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_session_priority(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_flip(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_rotation(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_blur_resolution(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_stage(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_pipe(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_csc_custom_matrix(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_level(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_preprocess(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_reserve_duration(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_q16(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_vui_timing_info(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_outbuf_fence_type(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
-int msm_vidc_set_outbuf_fence_direction(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_header_mode(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_deblock_mode(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_min_qp(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_max_qp(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_frame_qp(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_req_sync_frame(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_chroma_qp_index_offset(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_slice_count(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_layer_count_and_type(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_gop_size(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_bitrate(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_layer_bitrate(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_u32(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_u32_packed(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_u32_enum(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_constant_quality(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_vbr_related_properties(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_cbr_related_properties(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_use_and_mark_ltr(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_nal_length(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_session_priority(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_flip(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_rotation(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_blur_resolution(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_stage(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_pipe(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_csc_custom_matrix(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_level(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_preprocess(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_reserve_duration(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_q16(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_vui_timing_info(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_outbuf_fence_type(void *instance, enum msm_vidc_inst_capability_type cap_id);
+int msm_vidc_set_outbuf_fence_direction(void *instance, enum msm_vidc_inst_capability_type cap_id);

 #endif // _MSM_VIDC_PLATFORM_H_
--- a/driver/platform/common/inc/msm_vidc_platform_ext.h
+++ b/driver/platform/common/inc/msm_vidc_platform_ext.h
@@ -42,6 +42,7 @@ enum v4l2_mpeg_vidc_blur_types {
 	VIDC_BLUR_EXTERNAL           = 0x1,
 	VIDC_BLUR_ADAPTIVE           = 0x2,
 };
+
 /* (blur width) << 16 | (blur height) */
 #define V4L2_CID_MPEG_VIDC_VIDEO_BLUR_RESOLUTION                              \
 	(V4L2_CID_MPEG_VIDC_BASE + 0x11)
@@ -163,6 +164,7 @@ enum v4l2_mpeg_vidc_av1_tier {
 	V4L2_MPEG_VIDC_AV1_TIER_MAIN  = 0,
 	V4L2_MPEG_VIDC_AV1_TIER_HIGH  = 1,
 };
+
 /* Decoder Timestamp Reorder control */
 #define V4L2_CID_MPEG_VIDC_TS_REORDER           (V4L2_CID_MPEG_VIDC_BASE + 0x34)
 /* AV1 Decoder Film Grain */
@@ -258,9 +260,9 @@ int msm_vidc_adjust_dec_frame_rate(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_dec_operating_rate(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_adjust_delivery_mode(void *instance, struct v4l2_ctrl *ctrl);
 int msm_vidc_set_ir_period(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
+			   enum msm_vidc_inst_capability_type cap_id);
 int msm_vidc_set_signal_color_info(void *instance,
-	enum msm_vidc_inst_capability_type cap_id);
+				   enum msm_vidc_inst_capability_type cap_id);
 int msm_vidc_adjust_csc(void *instance, struct v4l2_ctrl *ctrl);

 #endif
--- a/driver/platform/common/inc/perf_static_model.h
+++ b/driver/platform/common/inc/perf_static_model.h
@@ -230,8 +230,8 @@ struct api_calculation_bw_output {
 };

 int msm_vidc_calculate_frequency(struct api_calculation_input codec_input,
-		struct api_calculation_freq_output *codec_output);
+				 struct api_calculation_freq_output *codec_output);
 int msm_vidc_calculate_bandwidth(struct api_calculation_input codec_input,
-		struct api_calculation_bw_output *codec_output);
+				 struct api_calculation_bw_output *codec_output);

 #endif /*_PERF_STATIC_MODEL_H_ */
--- a/driver/platform/common/src/msm_vidc_platform.c
+++ b/driver/platform/common/src/msm_vidc_platform.c
--- a/driver/platform/common/src/msm_vidc_platform_ext.c
+++ b/driver/platform/common/src/msm_vidc_platform_ext.c
@@ -23,9 +23,9 @@ int msm_vidc_adjust_ir_period(void *instance, struct v4l2_ctrl *ctrl)
 	adjusted_value = ctrl ? ctrl->val : inst->capabilities[IR_PERIOD].value;

 	if (msm_vidc_get_parent_value(inst, IR_PERIOD, ALL_INTRA,
-		&all_intra, __func__) ||
+				      &all_intra, __func__) ||
 		msm_vidc_get_parent_value(inst, IR_PERIOD, META_ROI_INFO,
-		&roi_enable, __func__))
+					  &roi_enable, __func__))
 		return -EINVAL;

 	if (all_intra) {
@@ -45,7 +45,7 @@ int msm_vidc_adjust_ir_period(void *instance, struct v4l2_ctrl *ctrl)

 	if (inst->codec == MSM_VIDC_HEVC) {
 		if (msm_vidc_get_parent_value(inst, IR_PERIOD,
-			PIX_FMTS, &pix_fmts, __func__))
+					      PIX_FMTS, &pix_fmts, __func__))
 			return -EINVAL;

 		if (is_10bit_colorformat(pix_fmts)) {
@@ -62,13 +62,12 @@ int msm_vidc_adjust_ir_period(void *instance, struct v4l2_ctrl *ctrl)
 	 * Hence, do not return error if not specified as one of the parent.
 	 */
 	if (is_parent_available(inst, IR_PERIOD, BITRATE_MODE, __func__) &&
-		inst->hfi_rc_type != HFI_RC_CBR_CFR &&
-		inst->hfi_rc_type != HFI_RC_CBR_VFR)
+	    inst->hfi_rc_type != HFI_RC_CBR_CFR &&
+	    inst->hfi_rc_type != HFI_RC_CBR_VFR)
 		adjusted_value = 0;

 exit:
-	msm_vidc_update_cap_value(inst, IR_PERIOD,
-		adjusted_value, __func__);
+	msm_vidc_update_cap_value(inst, IR_PERIOD, adjusted_value, __func__);

 	return 0;
 }
@@ -114,25 +113,23 @@ int msm_vidc_adjust_delivery_mode(void *instance, struct v4l2_ctrl *ctrl)
 	if (is_decode_session(inst))
 		return 0;

-
 	adjusted_value = ctrl ? ctrl->val : inst->capabilities[DELIVERY_MODE].value;

 	if (msm_vidc_get_parent_value(inst, DELIVERY_MODE, SLICE_MODE,
-		&slice_mode, __func__))
+				      &slice_mode, __func__))
 		return -EINVAL;

 	/* Slice encode delivery mode is only supported for Max MB slice mode */
 	if (slice_mode != V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB)
 		adjusted_value = 0;

-	msm_vidc_update_cap_value(inst, DELIVERY_MODE,
-		adjusted_value, __func__);
+	msm_vidc_update_cap_value(inst, DELIVERY_MODE, adjusted_value, __func__);

 	return 0;
 }

 int msm_vidc_set_ir_period(void *instance,
-	enum msm_vidc_inst_capability_type cap_id)
+			   enum msm_vidc_inst_capability_type cap_id)
 {
 	int rc = 0;
 	struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance;
@@ -169,7 +166,7 @@ int msm_vidc_set_ir_period(void *instance,
 }

 int msm_vidc_set_signal_color_info(void *instance,
-	enum msm_vidc_inst_capability_type cap_id)
+				   enum msm_vidc_inst_capability_type cap_id)
 {
 	int rc = 0;
 	struct msm_vidc_inst *inst = (struct msm_vidc_inst *)instance;
@@ -195,18 +192,18 @@ int msm_vidc_set_signal_color_info(void *instance,

 	input_fmt = &inst->fmts[INPUT_PORT];
 	pix_fmt = v4l2_colorformat_to_driver(inst,
-		input_fmt->fmt.pix_mp.pixelformat, __func__);
+					     input_fmt->fmt.pix_mp.pixelformat, __func__);
 	if (primaries != V4L2_COLORSPACE_DEFAULT ||
 	    matrix_coeff != V4L2_YCBCR_ENC_DEFAULT ||
 	    transfer_char != V4L2_XFER_FUNC_DEFAULT) {
 		colour_description_present_flag = 1;
 		video_signal_type_present_flag = 1;
 		primaries = v4l2_color_primaries_to_driver(inst,
-			primaries, __func__);
+							   primaries, __func__);
 		matrix_coeff = v4l2_matrix_coeff_to_driver(inst,
-			matrix_coeff, __func__);
+							   matrix_coeff, __func__);
 		transfer_char = v4l2_transfer_char_to_driver(inst,
-			transfer_char, __func__);
+							     transfer_char, __func__);
 	} else if (is_rgba_colorformat(pix_fmt)) {
 		colour_description_present_flag = 1;
 		video_signal_type_present_flag = 1;
@@ -230,7 +227,7 @@ int msm_vidc_set_signal_color_info(void *instance,
 		((video_signal_type_present_flag << 29) & 0x20000000);

 	rc = msm_vidc_packetize_control(inst, cap_id, HFI_PAYLOAD_32_PACKED,
-		&hfi_value, sizeof(u32), __func__);
+					&hfi_value, sizeof(u32), __func__);
 	if (rc)
 		return rc;

@@ -249,7 +246,7 @@ int msm_vidc_adjust_csc(void *instance, struct v4l2_ctrl *ctrl)
 	adjusted_value = ctrl ? ctrl->val : inst->capabilities[CSC].value;

 	if (msm_vidc_get_parent_value(inst, CSC, PIX_FMTS,
-		&pix_fmt, __func__))
+				      &pix_fmt, __func__))
 		return -EINVAL;

 	/* disable csc for 10-bit encoding */