diff options
| author | Sidath Senanayake <sidaths@google.com> | 2020-09-22 19:26:46 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2020-09-22 19:31:32 +0100 |
| commit | f27a9b87191d243a17350c528037bae6ce6e6da4 (patch) | |
| tree | 2477b695cd33283cf31bdd9d357432d9a6290088 /mali_kbase/context/backend | |
| parent | d5e0376a407d7729714f269101c6120f2589af69 (diff) | |
| parent | d4ca6eb7268ee2db9deabd1745b505c6e1c162f9 (diff) | |
| download | gpu-f27a9b87191d243a17350c528037bae6ce6e6da4.tar.gz | |
Merge r26p0 from upstream into android-gs-pixel-5.4
This commit updates the Mali KMD to version r26p0 from
commit d4ca6eb7268ee2db9deabd1745b505c6e1c162f9
Bug: 168298113
Change-Id: Ie8caf2df2ec573a1b458651fa5eb0806efb993f1
Diffstat (limited to 'mali_kbase/context/backend')
| -rw-r--r-- | mali_kbase/context/backend/mali_kbase_context_jm.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/mali_kbase/context/backend/mali_kbase_context_jm.c b/mali_kbase/context/backend/mali_kbase_context_jm.c index 83d8fdc..c9d65fc 100644 --- a/mali_kbase/context/backend/mali_kbase_context_jm.c +++ b/mali_kbase/context/backend/mali_kbase_context_jm.c @@ -30,6 +30,7 @@ #include <mali_kbase.h> #include <mali_kbase_ctx_sched.h> #include <mali_kbase_dma_fence.h> +#include <mali_kbase_kinstr_jm.h> #include <mali_kbase_mem_linux.h> #include <mali_kbase_mem_pool_group.h> #include <mmu/mali_kbase_mmu.h> @@ -70,6 +71,21 @@ void kbase_context_debugfs_term(struct kbase_context *const kctx) KBASE_EXPORT_SYMBOL(kbase_context_debugfs_term); #endif /* CONFIG_DEBUG_FS */ +static int kbase_context_kbase_kinstr_jm_init(struct kbase_context *kctx) +{ + int ret = kbase_kinstr_jm_init(&kctx->kinstr_jm); + + if (!ret) + return ret; + + return 0; +} + +static void kbase_context_kbase_kinstr_jm_term(struct kbase_context *kctx) +{ + kbase_kinstr_jm_term(kctx->kinstr_jm); +} + static int kbase_context_kbase_timer_setup(struct kbase_context *kctx) { kbase_timer_setup(&kctx->soft_job_timeout, @@ -122,6 +138,8 @@ static const struct kbase_context_init context_init[] = { "Sticky resource initialization failed"}, {kbase_jit_init, kbase_jit_term, "JIT initialization failed"}, + {kbase_context_kbase_kinstr_jm_init, kbase_context_kbase_kinstr_jm_term, + "JM instrumentation initialization failed"}, {kbase_context_kbase_timer_setup, NULL, NULL}, {kbase_context_submit_check, NULL, NULL}, }; |