diff options
| author | Ankit Goyal <layog@google.com> | 2022-02-04 11:19:07 -0800 |
|---|---|---|
| committer | Ankit Goyal <layog@google.com> | 2022-02-04 11:25:47 -0800 |
| commit | 2f5da18856d5a2958bbdac0b253ea386396c707f (patch) | |
| tree | d2777548214686712fcc6949021b3e5724126b7a /mali_kbase/context | |
| parent | 1c7550832b3d4526725e383532468c852b3bf185 (diff) | |
| parent | 5f4f61f8a249880c9ab5a1475daf342353c1f91a (diff) | |
| download | gpu-2f5da18856d5a2958bbdac0b253ea386396c707f.tar.gz | |
Merge r35p0 update from gs101 branch to gs201 branch
Change-Id: I161b11a47ce8773d9c7d618c7140d0d66f41a294
Diffstat (limited to 'mali_kbase/context')
| -rw-r--r-- | mali_kbase/context/backend/mali_kbase_context_csf.c | 1 | ||||
| -rw-r--r-- | mali_kbase/context/mali_kbase_context.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mali_kbase/context/backend/mali_kbase_context_csf.c b/mali_kbase/context/backend/mali_kbase_context_csf.c index 5a0caf3..48750ef 100644 --- a/mali_kbase/context/backend/mali_kbase_context_csf.c +++ b/mali_kbase/context/backend/mali_kbase_context_csf.c @@ -49,6 +49,7 @@ void kbase_context_debugfs_init(struct kbase_context *const kctx) kbase_csf_queue_group_debugfs_init(kctx); kbase_csf_kcpu_debugfs_init(kctx); kbase_csf_tiler_heap_debugfs_init(kctx); + kbase_csf_tiler_heap_total_debugfs_init(kctx); kbase_csf_cpu_queue_debugfs_init(kctx); } KBASE_EXPORT_SYMBOL(kbase_context_debugfs_init); diff --git a/mali_kbase/context/mali_kbase_context.c b/mali_kbase/context/mali_kbase_context.c index 1b03cfc..f7a0c09 100644 --- a/mali_kbase/context/mali_kbase_context.c +++ b/mali_kbase/context/mali_kbase_context.c @@ -210,8 +210,6 @@ int kbase_context_common_init(struct kbase_context *kctx) kctx->id = atomic_add_return(1, &(kctx->kbdev->ctx_num)) - 1; - mutex_init(&kctx->legacy_hwcnt_lock); - mutex_lock(&kctx->kbdev->kctx_list_lock); err = kbase_insert_kctx_to_process(kctx); |