From dbf356e587ec1d8502b47f946d03bf4cd637526a Mon Sep 17 00:00:00 2001
From: Leo Chen <yinchiuan@google.com>
Date: Fri, 9 Dec 2022 04:19:52 +0000
Subject: [PATCH] ANDROID: Update the ABI representation

4 function symbol(s) added
  'void drm_atomic_bridge_chain_post_disable(struct drm_bridge *, struct drm_atomic_state *)'
  'void drm_atomic_helper_calc_timestamping_constants(struct drm_atomic_state *)'
  'void drm_atomic_helper_update_legacy_modeset_state(struct drm_device *, struct drm_atomic_state *)'
  'bool drm_dev_has_vblank(const struct drm_device *)'

Bug: 255678834
Change-Id: I871b9a4ee778a42df20bbde767815f3ae2cb4364
Signed-off-by: Leo Chen <yinchiuan@google.com>
---
 android/abi_gki_aarch64.xml     | 25 +++++++++++++++++++++++++
 android/abi_gki_aarch64_generic |  5 +++++
 2 files changed, 30 insertions(+)

diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 6cff0cc4d40d..45ccb6c6ac83 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -1346,6 +1346,7 @@
       <elf-symbol name='drm_atomic_add_affected_connectors' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xbb6bc54b'/>
       <elf-symbol name='drm_atomic_add_affected_planes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8a323752'/>
       <elf-symbol name='drm_atomic_bridge_chain_disable' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf4d72636'/>
+      <elf-symbol name='drm_atomic_bridge_chain_post_disable' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x20ebacd9'/>
       <elf-symbol name='drm_atomic_commit' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x58b07db8'/>
       <elf-symbol name='drm_atomic_get_connector_state' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xee2601a'/>
       <elf-symbol name='drm_atomic_get_crtc_state' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xfa0bdd3a'/>
@@ -1358,6 +1359,7 @@
       <elf-symbol name='drm_atomic_helper_bridge_duplicate_state' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa5998721'/>
       <elf-symbol name='drm_atomic_helper_bridge_propagate_bus_fmt' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe55f2d85'/>
       <elf-symbol name='drm_atomic_helper_bridge_reset' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x23a1e86e'/>
+      <elf-symbol name='drm_atomic_helper_calc_timestamping_constants' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xcd00869c'/>
       <elf-symbol name='drm_atomic_helper_check' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3f5acfaa'/>
       <elf-symbol name='drm_atomic_helper_check_modeset' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x26dfd24d'/>
       <elf-symbol name='drm_atomic_helper_check_plane_state' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8e324985'/>
@@ -1391,6 +1393,7 @@
       <elf-symbol name='drm_atomic_helper_setup_commit' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa9ec9273'/>
       <elf-symbol name='drm_atomic_helper_shutdown' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd2595258'/>
       <elf-symbol name='drm_atomic_helper_swap_state' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x1e1d3691'/>
+      <elf-symbol name='drm_atomic_helper_update_legacy_modeset_state' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9e354f0b'/>
       <elf-symbol name='drm_atomic_helper_update_plane' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x88dca210'/>
       <elf-symbol name='drm_atomic_helper_wait_for_dependencies' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3042f182'/>
       <elf-symbol name='drm_atomic_helper_wait_for_fences' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe958c0e3'/>
@@ -1454,6 +1457,7 @@
       <elf-symbol name='drm_dev_enter' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xdb0f0f5'/>
       <elf-symbol name='drm_dev_exit' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe8a034df'/>
       <elf-symbol name='drm_dev_get' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2e1cf5c6'/>
+      <elf-symbol name='drm_dev_has_vblank' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa166a025'/>
       <elf-symbol name='drm_dev_printk' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa8be3c83'/>
       <elf-symbol name='drm_dev_put' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2d989159'/>
       <elf-symbol name='drm_dev_register' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x47dc0aba'/>
@@ -15357,6 +15361,7 @@
         </data-member>
       </class-decl>
       <pointer-type-def type-id='7addb8a1' size-in-bits='64' id='1cb2627d'/>
+      <qualified-type-def type-id='e96cc76d' const='yes' id='1cbdedf4'/>
       <pointer-type-def type-id='b69cad70' size-in-bits='64' id='1cc860f2'/>
       <function-type size-in-bits='64' id='1ccd8971'>
         <parameter type-id='68a2d05b'/>
@@ -15422,6 +15427,7 @@
       </class-decl>
       <pointer-type-def type-id='99690429' size-in-bits='64' id='1cebc84d'/>
       <pointer-type-def type-id='8f68aa3b' size-in-bits='64' id='1cf47bfb'/>
+      <pointer-type-def type-id='1cbdedf4' size-in-bits='64' id='1cfd747a'/>
       <class-decl name='if_settings' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/uapi/linux/if.h' line='207' column='1' id='1cff49be'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='type' type-id='f0981eeb' visibility='default' filepath='include/uapi/linux/if.h' line='208' column='1'/>
@@ -120278,6 +120284,11 @@
         <parameter type-id='e3dd029e' name='old_state' filepath='drivers/gpu/drm/drm_bridge.c' line='570' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='drm_atomic_bridge_chain_post_disable' mangled-name='drm_atomic_bridge_chain_post_disable' filepath='drivers/gpu/drm/drm_bridge.c' line='613' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_atomic_bridge_chain_post_disable'>
+        <parameter type-id='8582e5ec' name='bridge' filepath='drivers/gpu/drm/drm_bridge.c' line='613' column='1'/>
+        <parameter type-id='e3dd029e' name='old_state' filepath='drivers/gpu/drm/drm_bridge.c' line='614' column='1'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='drm_atomic_commit' mangled-name='drm_atomic_commit' filepath='drivers/gpu/drm/drm_atomic.c' line='1334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_atomic_commit'>
         <parameter type-id='e3dd029e' name='state' filepath='drivers/gpu/drm/drm_atomic.c' line='1334' column='1'/>
         <return type-id='95e97e5e'/>
@@ -120339,6 +120350,10 @@
         <parameter type-id='8582e5ec' name='bridge' filepath='drivers/gpu/drm/drm_atomic_state_helper.c' line='648' column='1'/>
         <return type-id='67bbaeda'/>
       </function-decl>
+      <function-decl name='drm_atomic_helper_calc_timestamping_constants' mangled-name='drm_atomic_helper_calc_timestamping_constants' filepath='drivers/gpu/drm/drm_atomic_helper.c' line='1208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_atomic_helper_calc_timestamping_constants'>
+        <parameter type-id='e3dd029e' name='state' filepath='drivers/gpu/drm/drm_atomic_helper.c' line='1208' column='1'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='drm_atomic_helper_check' mangled-name='drm_atomic_helper_check' filepath='drivers/gpu/drm/drm_atomic_helper.c' line='959' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_atomic_helper_check'>
         <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_atomic_helper.c' line='959' column='1'/>
         <parameter type-id='e3dd029e' name='state' filepath='drivers/gpu/drm/drm_atomic_helper.c' line='960' column='1'/>
@@ -120507,6 +120522,11 @@
         <parameter type-id='b50a4934' name='stall' filepath='drivers/gpu/drm/drm_atomic_helper.c' line='2767' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
+      <function-decl name='drm_atomic_helper_update_legacy_modeset_state' mangled-name='drm_atomic_helper_update_legacy_modeset_state' filepath='drivers/gpu/drm/drm_atomic_helper.c' line='1140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_atomic_helper_update_legacy_modeset_state'>
+        <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_atomic_helper.c' line='1140' column='1'/>
+        <parameter type-id='e3dd029e' name='old_state' filepath='drivers/gpu/drm/drm_atomic_helper.c' line='1141' column='1'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='drm_atomic_helper_update_plane' mangled-name='drm_atomic_helper_update_plane' filepath='drivers/gpu/drm/drm_atomic_helper.c' line='2897' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_atomic_helper_update_plane'>
         <parameter type-id='a6711537' name='plane' filepath='drivers/gpu/drm/drm_atomic_helper.c' line='2897' column='1'/>
         <parameter type-id='b64ad7cb' name='crtc' filepath='drivers/gpu/drm/drm_atomic_helper.c' line='2898' column='1'/>
@@ -120836,6 +120856,10 @@
         <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_drv.c' line='765' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='drm_dev_has_vblank' mangled-name='drm_dev_has_vblank' filepath='drivers/gpu/drm/drm_vblank.c' line='570' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_dev_has_vblank'>
+        <parameter type-id='1cfd747a' name='dev' filepath='drivers/gpu/drm/drm_vblank.c' line='570' column='1'/>
+        <return type-id='b50a4934'/>
+      </function-decl>
       <function-decl name='drm_dev_printk' mangled-name='drm_dev_printk' filepath='drivers/gpu/drm/drm_print.c' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_dev_printk'>
         <parameter type-id='8df61054' name='dev' filepath='drivers/gpu/drm/drm_print.c' line='238' column='1'/>
         <parameter type-id='80f4b756' name='level' filepath='drivers/gpu/drm/drm_print.c' line='238' column='1'/>
@@ -134857,6 +134881,7 @@
     </abi-instr>
   </abi-corpus>
 </abi-corpus-group>
+
 <!--
      libabigail: abidw: 2.1.0SOONG BUILD NUMBER PLACEHOLDER
 -->
diff --git a/android/abi_gki_aarch64_generic b/android/abi_gki_aarch64_generic
index 2d377591d6fb..4c3f3d525b62 100644
--- a/android/abi_gki_aarch64_generic
+++ b/android/abi_gki_aarch64_generic
@@ -622,6 +622,7 @@
   down_trylock
   down_write
   d_path
+  dput
   drain_workqueue
   driver_create_file
   driver_register
@@ -631,6 +632,7 @@
   drm_atomic_add_affected_connectors
   drm_atomic_add_affected_planes
   drm_atomic_bridge_chain_disable
+  drm_atomic_bridge_chain_post_disable
   drm_atomic_commit
   drm_atomic_get_connector_state
   drm_atomic_get_crtc_state
@@ -641,6 +643,7 @@
   drm_atomic_helper_bridge_destroy_state
   drm_atomic_helper_bridge_duplicate_state
   drm_atomic_helper_bridge_reset
+  drm_atomic_helper_calc_timestamping_constants
   drm_atomic_helper_check_modeset
   drm_atomic_helper_check_planes
   drm_atomic_helper_check_plane_state
@@ -669,6 +672,7 @@
   drm_atomic_helper_setup_commit
   drm_atomic_helper_shutdown
   drm_atomic_helper_swap_state
+  drm_atomic_helper_update_legacy_modeset_state
   drm_atomic_helper_update_plane
   drm_atomic_helper_wait_for_dependencies
   drm_atomic_helper_wait_for_fences
@@ -712,6 +716,7 @@
   drm_crtc_vblank_put
   drm_crtc_wait_one_vblank
   __drm_dbg
+  drm_dev_has_vblank
   drm_dev_put
   drm_dev_register
   drm_dev_unregister