video: driver: Move adjust/set control functions to common/platform.c

Move adjust/set control functions to common/platform.c as part of
upstream effort.
This is part 1 of the change.

Change-Id: I8c440740fe785b5b052c4d44963ea34c21419fa4
Signed-off-by: Ankush Mitra <quic_ankumitr@quicinc.com>

driver/platform/common/inc/msm_vidc_platform.h

@@ -237,4 +237,128 @@ static inline bool is_regulator_supported(struct msm_vidc_core *core)
 int msm_vidc_init_platform(struct platform_device *pdev);
 int msm_vidc_deinit_platform(struct platform_device *pdev);
 
+/* control framework support functions */
+
+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);
+int msm_vidc_get_parent_value(struct msm_vidc_inst *inst, u32 cap, u32 parent,
+	s32 *value, const char *func);
+u32 msm_vidc_get_port_info(struct msm_vidc_inst *inst,
+	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);
+int msm_vidc_v4l2_to_hfi_enum(struct msm_vidc_inst *inst,
+	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);
+
+int msm_vidc_adjust_bitrate(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_dynamic_layer_bitrate(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_bitrate_mode(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_entropy_mode(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_profile(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_ltr_count(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_use_ltr(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_mark_ltr(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_delta_based_rc(void *instance, struct v4l2_ctrl *ctrl);
+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_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);
+int msm_vidc_adjust_b_frame(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_peak_bitrate(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_hevc_min_qp(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_hevc_max_qp(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_hevc_i_frame_qp(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_hevc_p_frame_qp(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_hevc_b_frame_qp(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_blur_type(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_blur_resolution(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_brs(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_bitrate_boost(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_min_quality(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_enc_lowlatency_mode(void *instance, struct v4l2_ctrl *ctrl);
+int msm_vidc_adjust_dec_lowlatency_mode(void *instance, struct v4l2_ctrl *ctrl);
+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(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_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_dynamic_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);
+
 #endif // _MSM_VIDC_PLATFORM_H_

driver/variant/iris2/src/msm_vidc_buffer_iris2.c

@@ -12,7 +12,7 @@
 #include "msm_vidc_driver.h"
 #include "msm_vidc_debug.h"
 #include "msm_media_info.h"
-#include "msm_vidc_control.h"
+#include "msm_vidc_platform.h"
 
 static u32 msm_vidc_decoder_bin_size_iris2(struct msm_vidc_inst *inst)
 {

driver/variant/iris2/src/msm_vidc_iris2.c

@@ -9,11 +9,10 @@
 #include "msm_vidc_inst.h"
 #include "msm_vidc_core.h"
 #include "msm_vidc_driver.h"
-#include "msm_vidc_control.h"
+#include "msm_vidc_plaform.h"
 #include "msm_vidc_internal.h"
 #include "msm_vidc_buffer.h"
 #include "msm_vidc_debug.h"
-#include "msm_vidc_control.h"
 #include "msm_vidc_variant.h"
 
 #define VIDEO_ARCH_LX 1

driver/variant/iris3/src/msm_vidc_buffer_iris3.c

@@ -13,7 +13,7 @@
 #include "msm_vidc_driver.h"
 #include "msm_vidc_debug.h"
 #include "msm_media_info.h"
-#include "msm_vidc_control.h"
+#include "msm_vidc_platform.h"
 
 static u32 msm_vidc_decoder_bin_size_iris3(struct msm_vidc_inst *inst)
 {

driver/variant/iris3/src/msm_vidc_iris3.c

@@ -11,7 +11,7 @@
 #include "msm_vidc_inst.h"
 #include "msm_vidc_core.h"
 #include "msm_vidc_driver.h"
-#include "msm_vidc_control.h"
+#include "msm_vidc_platform.h"
 #include "msm_vidc_internal.h"
 #include "msm_vidc_buffer.h"
 #include "msm_vidc_debug.h"

driver/variant/iris33/src/msm_vidc_buffer_iris33.c

@@ -13,7 +13,7 @@
 #include "msm_vidc_driver.h"
 #include "msm_vidc_debug.h"
 #include "msm_media_info.h"
-#include "msm_vidc_control.h"
+#include "msm_vidc_platform.h"
 
 static u32 msm_vidc_decoder_bin_size_iris33(struct msm_vidc_inst *inst)
 {

driver/variant/iris33/src/msm_vidc_iris33.c

@@ -11,7 +11,7 @@
 #include "msm_vidc_inst.h"
 #include "msm_vidc_core.h"
 #include "msm_vidc_driver.h"
-#include "msm_vidc_control.h"
+#include "msm_vidc_platform.h"
 #include "msm_vidc_internal.h"
 #include "msm_vidc_buffer.h"
 #include "msm_vidc_debug.h"

driver/vidc/inc/msm_vidc_control.h

@@ -14,128 +14,9 @@ int msm_vidc_ctrl_init(struct msm_vidc_inst *inst);
 int msm_vidc_ctrl_deinit(struct msm_vidc_inst *inst);
 int msm_v4l2_op_s_ctrl(struct v4l2_ctrl *ctrl);
 int msm_v4l2_op_g_volatile_ctrl(struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_bitrate(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_dynamic_layer_bitrate(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_bitrate_mode(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_entropy_mode(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_profile(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_ltr_count(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_use_ltr(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_mark_ltr(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_delta_based_rc(void *instance, struct v4l2_ctrl *ctrl);
-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_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);
-int msm_vidc_adjust_b_frame(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_peak_bitrate(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_hevc_min_qp(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_hevc_max_qp(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_hevc_i_frame_qp(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_hevc_p_frame_qp(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_hevc_b_frame_qp(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_blur_type(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_blur_resolution(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_brs(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_bitrate_boost(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_min_quality(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_enc_lowlatency_mode(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_dec_lowlatency_mode(void *instance, struct v4l2_ctrl *ctrl);
-int msm_vidc_adjust_set_v4l2_properties(struct msm_vidc_inst *inst);
 int msm_vidc_prepare_dependency_list(struct msm_vidc_inst *inst);
-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(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_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_dynamic_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_v4l2_menu_to_hfi(struct msm_vidc_inst *inst,
-	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);
-bool is_parent_available(struct msm_vidc_inst *inst,
-	u32 cap_id, u32 check_parent, const char *func);
+int msm_vidc_adjust_set_v4l2_properties(struct msm_vidc_inst *inst);
 bool is_valid_cap_id(enum msm_vidc_inst_capability_type cap_id);
 enum msm_vidc_inst_capability_type msm_vidc_get_cap_id(
 	struct msm_vidc_inst *inst, u32 id);
-int msm_vidc_v4l2_to_hfi_enum(struct msm_vidc_inst *inst,
-	enum msm_vidc_inst_capability_type cap_id, u32 *value);
-int msm_vidc_update_cap_value(struct msm_vidc_inst *inst, u32 cap,
-	s32 adjusted_val, const char *func);
-int msm_vidc_get_parent_value(struct msm_vidc_inst* inst, u32 cap, u32 parent,
-	s32 *value, const char *func);
-u32 msm_vidc_get_port_info(struct msm_vidc_inst *inst,
-	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);
-
 #endif

driver/vidc/src/msm_vdec.c

@@ -15,7 +15,7 @@
 #include "msm_vidc_control.h"
 #include "msm_vidc_debug.h"
 #include "msm_vidc_power.h"
-#include "msm_vidc_control.h"
+#include "msm_vidc_platform.h"
 #include "msm_vidc_memory.h"
 #include "venus_hfi.h"
 #include "hfi_packet.h"

driver/vidc/src/msm_venc.c

@@ -15,6 +15,7 @@
 #include "msm_vidc_power.h"
 #include "venus_hfi.h"
 #include "hfi_packet.h"
+#include "msm_vidc_platform.h"
 
 static const u32 msm_venc_input_set_prop[] = {
 	HFI_PROP_COLOR_FORMAT,

driver/vidc/src/msm_vidc_control_ext.c

@@ -12,6 +12,7 @@
 #include "msm_vidc_internal.h"
 #include "msm_vidc_driver.h"
 #include "msm_venc.h"
+#include "msm_vidc_platform.h"
 
 int msm_vidc_adjust_ir_period(void *instance, struct v4l2_ctrl *ctrl)
 {

driver/vidc/src/venus_hfi_response.c

@@ -12,7 +12,6 @@
 #include "msm_vidc_debug.h"
 #include "msm_vidc_driver.h"
 #include "msm_vdec.h"
-#include "msm_vidc_control.h"
 #include "msm_vidc_memory.h"
 #include "msm_vidc_fence.h"
 #include "msm_vidc_platform.h"