From 6a10b34387ef8e94245e0f2d73e9f3539fa0f4c4 Mon Sep 17 00:00:00 2001 From: Kever Yang Date: Thu, 14 Sep 2023 15:31:44 +0800 Subject: [PATCH] ANDROID: GKI: Add symbols for rockchip v4l2 INFO: ABI DIFFERENCES HAVE BEEN DETECTED! INFO: 11 function symbol(s) added 'int __v4l2_ctrl_handler_setup(struct v4l2_ctrl_handler*)' 'bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings*, const struct v4l2_dv_timings_cap*, unsigned int, v4l2_check_dv_timings_fnc*, void*)' 'int v4l2_pipeline_pm_get(struct media_entity*)' 'void v4l2_pipeline_pm_put(struct media_entity*)' 'void v4l2_print_dv_timings(const char*, const char*, const struct v4l2_dv_timings*, bool)' 'int v4l2_querymenu(struct v4l2_ctrl_handler*, struct v4l2_querymenu*)' 'int v4l2_src_change_event_subdev_subscribe(struct v4l2_subdev*, struct v4l2_fh*, struct v4l2_event_subscription*)' 'void v4l2_subdev_notify_event(struct v4l2_subdev*, const struct v4l2_event*)' 'bool v4l2_valid_dv_timings(const struct v4l2_dv_timings*, const struct v4l2_dv_timings_cap*, v4l2_check_dv_timings_fnc*, void*)' 'int video_device_pipeline_start(struct video_device*, struct media_pipeline*)' 'void video_device_pipeline_stop(struct video_device*)' 1 variable symbol(s) added 'const char* v4l2_type_names[15]' Bug: 300024866 Change-Id: I1c7e85b6b125c2dfb43fe2ac4c4c9b2867119513 Signed-off-by: Kever Yang --- android/abi_gki_aarch64.stg | 173 +++++++++++++++++++++++++++++++ android/abi_gki_aarch64_rockchip | 62 +++++++++++ 2 files changed, 235 insertions(+) diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg index ebb2e3519cf1..227be236d819 100644 --- a/android/abi_gki_aarch64.stg +++ b/android/abi_gki_aarch64.stg @@ -38210,6 +38210,11 @@ array { number_of_elements: 15 element_type_id: 0x384f7d7c } +array { + id: 0xf95ab7ac + number_of_elements: 15 + element_type_id: 0x3e10b518 +} array { id: 0xf95fb1e4 number_of_elements: 8 @@ -286034,6 +286039,12 @@ function { parameter_id: 0x0258f96e parameter_id: 0x0490bb4a } +function { + id: 0x101d83a0 + return_type_id: 0x48b5725f + parameter_id: 0x01c5a749 + parameter_id: 0x3d2ef874 +} function { id: 0x10219d88 return_type_id: 0x48b5725f @@ -296915,6 +296926,14 @@ function { return_type_id: 0x48b5725f parameter_id: 0x3df0a7d3 } +function { + id: 0x1fe91863 + return_type_id: 0x48b5725f + parameter_id: 0x3e10b518 + parameter_id: 0x3e10b518 + parameter_id: 0x324e7f0f + parameter_id: 0x6d7f5ff6 +} function { id: 0x1feaaebf return_type_id: 0x48b5725f @@ -313257,6 +313276,11 @@ function { return_type_id: 0x6720d32f parameter_id: 0x1e9705eb } +function { + id: 0x9a25325b + return_type_id: 0x6720d32f + parameter_id: 0x1e9745d3 +} function { id: 0x9a299233 return_type_id: 0x6720d32f @@ -319870,6 +319894,12 @@ function { parameter_id: 0x01c5a749 parameter_id: 0x30600191 } +function { + id: 0x9d30566e + return_type_id: 0x6720d32f + parameter_id: 0x026c3dea + parameter_id: 0x0aee8ed6 +} function { id: 0x9d30fa23 return_type_id: 0x6720d32f @@ -320686,6 +320716,12 @@ function { parameter_id: 0xc700b957 parameter_id: 0x07dcdbe1 } +function { + id: 0x9da46876 + return_type_id: 0x6720d32f + parameter_id: 0x01e0b0cf + parameter_id: 0x1729da91 +} function { id: 0x9da4bde5 return_type_id: 0x6720d32f @@ -327689,6 +327725,14 @@ function { return_type_id: 0x26e55184 parameter_id: 0x3e10b518 } +function { + id: 0xf2d3e848 + return_type_id: 0x6d7f5ff6 + parameter_id: 0x324e7f0f + parameter_id: 0x3bcd0c02 + parameter_id: 0x2de928d9 + parameter_id: 0x18bd6530 +} function { id: 0xf2d73ac2 return_type_id: 0x6d7f5ff6 @@ -327777,6 +327821,15 @@ function { return_type_id: 0x6d7f5ff6 parameter_id: 0x36194830 } +function { + id: 0xf3248c4f + return_type_id: 0x6d7f5ff6 + parameter_id: 0x35f8cea5 + parameter_id: 0x3bcd0c02 + parameter_id: 0x4585663f + parameter_id: 0x2de928d9 + parameter_id: 0x18bd6530 +} function { id: 0xf334abb2 return_type_id: 0x6d7f5ff6 @@ -339064,6 +339117,15 @@ elf_symbol { type_id: 0x20cd94dc full_name: "__usecs_to_jiffies" } +elf_symbol { + id: 0x4c0a941a + name: "__v4l2_ctrl_handler_setup" + is_defined: true + symbol_type: FUNCTION + crc: 0x3ae35349 + type_id: 0x9d1bec55 + full_name: "__v4l2_ctrl_handler_setup" +} elf_symbol { id: 0xfc85c168 name: "__v4l2_ctrl_modify_range" @@ -390108,6 +390170,15 @@ elf_symbol { type_id: 0x9bba7997 full_name: "v4l2_fh_release" } +elf_symbol { + id: 0x538ad5cc + name: "v4l2_find_dv_timings_cap" + is_defined: true + symbol_type: FUNCTION + crc: 0x3aa68d7a + type_id: 0xf3248c4f + full_name: "v4l2_find_dv_timings_cap" +} elf_symbol { id: 0x2244c8f0 name: "v4l2_format_info" @@ -390567,6 +390638,42 @@ elf_symbol { type_id: 0x900d5d3b full_name: "v4l2_pipeline_link_notify" } +elf_symbol { + id: 0xb2eba8d7 + name: "v4l2_pipeline_pm_get" + is_defined: true + symbol_type: FUNCTION + crc: 0x12d08c2a + type_id: 0x9a25325b + full_name: "v4l2_pipeline_pm_get" +} +elf_symbol { + id: 0xa84f74e5 + name: "v4l2_pipeline_pm_put" + is_defined: true + symbol_type: FUNCTION + crc: 0xce6853d3 + type_id: 0x173d80e7 + full_name: "v4l2_pipeline_pm_put" +} +elf_symbol { + id: 0x64b2fdfd + name: "v4l2_print_dv_timings" + is_defined: true + symbol_type: FUNCTION + crc: 0x08402862 + type_id: 0x1fe91863 + full_name: "v4l2_print_dv_timings" +} +elf_symbol { + id: 0x34ad1913 + name: "v4l2_querymenu" + is_defined: true + symbol_type: FUNCTION + crc: 0x11003a10 + type_id: 0x9d30566e + full_name: "v4l2_querymenu" +} elf_symbol { id: 0x5f3882d0 name: "v4l2_s_ctrl" @@ -390585,6 +390692,15 @@ elf_symbol { type_id: 0x9df4075f full_name: "v4l2_s_parm_cap" } +elf_symbol { + id: 0x90eb49a1 + name: "v4l2_src_change_event_subdev_subscribe" + is_defined: true + symbol_type: FUNCTION + crc: 0xe05167de + type_id: 0x9d3b60fc + full_name: "v4l2_src_change_event_subdev_subscribe" +} elf_symbol { id: 0xac8d7ab3 name: "v4l2_src_change_event_subscribe" @@ -390630,6 +390746,33 @@ elf_symbol { type_id: 0x9d1d4664 full_name: "v4l2_subdev_link_validate_default" } +elf_symbol { + id: 0x5da8252d + name: "v4l2_subdev_notify_event" + is_defined: true + symbol_type: FUNCTION + crc: 0x9389db87 + type_id: 0x101d83a0 + full_name: "v4l2_subdev_notify_event" +} +elf_symbol { + id: 0x1e8152b6 + name: "v4l2_type_names" + is_defined: true + symbol_type: OBJECT + crc: 0x123959a1 + type_id: 0xf95ab7ac + full_name: "v4l2_type_names" +} +elf_symbol { + id: 0xd07f1826 + name: "v4l2_valid_dv_timings" + is_defined: true + symbol_type: FUNCTION + crc: 0x0af3d134 + type_id: 0xf2d3e848 + full_name: "v4l2_valid_dv_timings" +} elf_symbol { id: 0x7733b651 name: "v4l_bound_align_image" @@ -391251,6 +391394,24 @@ elf_symbol { type_id: 0x90a73fa7 full_name: "video_device_alloc" } +elf_symbol { + id: 0x2e0c3fe5 + name: "video_device_pipeline_start" + is_defined: true + symbol_type: FUNCTION + crc: 0x7a4ef3ef + type_id: 0x9da46876 + full_name: "video_device_pipeline_start" +} +elf_symbol { + id: 0xae3c44c1 + name: "video_device_pipeline_stop" + is_defined: true + symbol_type: FUNCTION + crc: 0xc359213b + type_id: 0x10e07da0 + full_name: "video_device_pipeline_stop" +} elf_symbol { id: 0xb1b42a22 name: "video_device_release" @@ -394625,6 +394786,7 @@ interface { symbol_id: 0x7c261545 symbol_id: 0xf497de36 symbol_id: 0xf44f6a18 + symbol_id: 0x4c0a941a symbol_id: 0xfc85c168 symbol_id: 0xb6af2644 symbol_id: 0x96901dfb @@ -400296,6 +400458,7 @@ interface { symbol_id: 0x592a4678 symbol_id: 0xff77e1ca symbol_id: 0xe66642fe + symbol_id: 0x538ad5cc symbol_id: 0x2244c8f0 symbol_id: 0x58330374 symbol_id: 0xdb18c924 @@ -400347,13 +400510,21 @@ interface { symbol_id: 0x906c5f61 symbol_id: 0xf40e82dd symbol_id: 0x9b29f9ed + symbol_id: 0xb2eba8d7 + symbol_id: 0xa84f74e5 + symbol_id: 0x64b2fdfd + symbol_id: 0x34ad1913 symbol_id: 0x5f3882d0 symbol_id: 0xe203e72f + symbol_id: 0x90eb49a1 symbol_id: 0xac8d7ab3 symbol_id: 0x2f159216 symbol_id: 0xb1da32d2 symbol_id: 0x354ec447 symbol_id: 0x28f5deaf + symbol_id: 0x5da8252d + symbol_id: 0x1e8152b6 + symbol_id: 0xd07f1826 symbol_id: 0x7733b651 symbol_id: 0x8e6a3c4a symbol_id: 0x3635e264 @@ -400423,6 +400594,8 @@ interface { symbol_id: 0x2f1da35c symbol_id: 0x47f90fd0 symbol_id: 0x969a2ec0 + symbol_id: 0x2e0c3fe5 + symbol_id: 0xae3c44c1 symbol_id: 0xb1b42a22 symbol_id: 0x689b6a95 symbol_id: 0xbd9fe5b6 diff --git a/android/abi_gki_aarch64_rockchip b/android/abi_gki_aarch64_rockchip index ef09752c3c14..8fdda5ad35fb 100644 --- a/android/abi_gki_aarch64_rockchip +++ b/android/abi_gki_aarch64_rockchip @@ -1247,6 +1247,47 @@ usb_submit_urb __usecs_to_jiffies usleep_range_state + v4l2_ctrl_find + v4l2_ctrl_g_ctrl + v4l2_ctrl_g_ctrl_int64 + v4l2_ctrl_handler_free + v4l2_ctrl_handler_init_class + __v4l2_ctrl_handler_setup + v4l2_ctrl_handler_setup + __v4l2_ctrl_modify_range + v4l2_ctrl_new_custom + v4l2_ctrl_new_int_menu + v4l2_ctrl_new_std + v4l2_ctrl_new_std_menu + v4l2_ctrl_new_std_menu_items + __v4l2_ctrl_s_ctrl + __v4l2_ctrl_s_ctrl_int64 + v4l2_ctrl_subdev_subscribe_event + v4l2_device_register + v4l2_device_register_subdev + __v4l2_device_register_subdev_nodes + v4l2_device_unregister + v4l2_device_unregister_subdev + v4l2_enum_dv_timings_cap + v4l2_event_queue + v4l2_event_subdev_unsubscribe + v4l2_event_subscribe + v4l2_event_unsubscribe + v4l2_fh_open + v4l2_i2c_subdev_init + v4l2_match_dv_timings + v4l2_pipeline_link_notify + v4l2_pipeline_pm_get + v4l2_pipeline_pm_put + v4l2_print_dv_timings + v4l2_querymenu + v4l2_src_change_event_subdev_subscribe + v4l2_subdev_call_wrappers + v4l2_subdev_init + v4l2_subdev_link_validate + v4l2_subdev_notify_event + v4l2_type_names + v4l2_valid_dv_timings vb2_buffer_done vb2_dma_contig_memops vb2_fop_mmap @@ -1269,6 +1310,13 @@ vb2_queue_release vb2_vmalloc_memops vfree + video_devdata + video_device_pipeline_start + video_device_pipeline_stop + video_device_release_empty + video_ioctl2 + __video_register_device + video_unregister_device vmalloc vmap vm_get_page_prot @@ -1728,6 +1776,9 @@ tcpm_unregister_port tcpm_vbus_change +# required by gc2145.ko + v4l2_ctrl_subdev_log_status + # required by gpio-regulator.ko gpiod_count @@ -2148,6 +2199,17 @@ # required by rockchip-cpufreq.ko cpufreq_unregister_notifier +# required by rockchip-hdmirx.ko + cec_s_phys_addr + cpu_latency_qos_remove_request + device_create_with_groups + of_reserved_mem_device_release + v4l2_ctrl_log_status + v4l2_ctrl_subscribe_event + v4l2_find_dv_timings_cap + v4l2_src_change_event_subscribe + vb2_fop_read + # required by rockchip-rng.ko devm_of_iomap