diff options
| author | Debarshi Dutta <debarshid@google.com> | 2023-08-10 16:21:00 +0000 |
|---|---|---|
| committer | Debarshi Dutta <debarshid@google.com> | 2023-08-10 16:21:00 +0000 |
| commit | c845dfc7713e44306c03d9a0ea73bb5625db09f7 (patch) | |
| tree | a6b1cba652a4e75b55c53a972b4928061752ed5c /mali_kbase | |
| parent | 67cf0926399ee85101cfa582dc511965befb82c1 (diff) | |
| parent | c69b9ff952155e24ed33fdf1e752216cffe168bb (diff) | |
| download | gpu-c845dfc7713e44306c03d9a0ea73bb5625db09f7.tar.gz | |
Merge "r43p0 KMD update: Re-merge goog/upstream@bce5281a0408a17" into android13-gs-pixel-5.10-udc-qpr1
Diffstat (limited to 'mali_kbase')
| -rw-r--r-- | mali_kbase/csf/mali_kbase_csf_firmware.h | 1 | ||||
| -rw-r--r-- | mali_kbase/mali_kbase_kinstr_prfcnt.c | 3 | ||||
| -rw-r--r-- | mali_kbase/mali_kbase_kinstr_prfcnt.h | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/mali_kbase/csf/mali_kbase_csf_firmware.h b/mali_kbase/csf/mali_kbase_csf_firmware.h index 9d7ed64..9e85c1d 100644 --- a/mali_kbase/csf/mali_kbase_csf_firmware.h +++ b/mali_kbase/csf/mali_kbase_csf_firmware.h @@ -910,6 +910,7 @@ int kbase_csf_trigger_firmware_config_update(struct kbase_device *kbdev); * GPU must be powered during this call. */ void kbase_csf_debug_dump_registers(struct kbase_device *kbdev); + /** * kbase_csf_firmware_req_core_dump - Request a firmware core dump * diff --git a/mali_kbase/mali_kbase_kinstr_prfcnt.c b/mali_kbase/mali_kbase_kinstr_prfcnt.c index 8d52689..cfafd11 100644 --- a/mali_kbase/mali_kbase_kinstr_prfcnt.c +++ b/mali_kbase/mali_kbase_kinstr_prfcnt.c @@ -1066,9 +1066,6 @@ kbasep_kinstr_prfcnt_client_destroy_partial(struct kbase_kinstr_prfcnt_client *c kfree(cli); } -#if !MALI_KERNEL_TEST_API -static -#endif void kbasep_kinstr_prfcnt_client_destroy(struct kbase_kinstr_prfcnt_client *cli) { kbasep_kinstr_prfcnt_client_destroy_partial(cli, KINSTR_PRFCNT_INITIALISED); diff --git a/mali_kbase/mali_kbase_kinstr_prfcnt.h b/mali_kbase/mali_kbase_kinstr_prfcnt.h index e8e9664..53e9674 100644 --- a/mali_kbase/mali_kbase_kinstr_prfcnt.h +++ b/mali_kbase/mali_kbase_kinstr_prfcnt.h @@ -80,8 +80,6 @@ void kbase_kinstr_prfcnt_suspend(struct kbase_kinstr_prfcnt_context *kinstr_ctx) */ void kbase_kinstr_prfcnt_resume(struct kbase_kinstr_prfcnt_context *kinstr_ctx); -#if MALI_KERNEL_TEST_API - /** * kbasep_kinstr_prfcnt_get_block_info_list() - Get list of all block types * with their information. @@ -159,7 +157,6 @@ int kbasep_kinstr_prfcnt_cmd(struct kbase_kinstr_prfcnt_client *cli, * @cli: kinstr_prfcnt client. Must not be attached to a kinstr_prfcnt context. */ void kbasep_kinstr_prfcnt_client_destroy(struct kbase_kinstr_prfcnt_client *cli); -#endif /* MALI_KERNEL_TEST_API */ /** * kbase_kinstr_prfcnt_enum_info - Enumerate performance counter information. |