diff options
| author | Ankit Goyal <layog@google.com> | 2022-01-19 09:20:00 -0800 |
|---|---|---|
| committer | Ankit Goyal <layog@google.com> | 2022-01-19 09:21:39 -0800 |
| commit | 5f4f61f8a249880c9ab5a1475daf342353c1f91a (patch) | |
| tree | ea75ea381815ad945e86c3b5f8f510e76245009a /mali_kbase/context | |
| parent | 5381ff7b4106b277ff207396e293ede2bf959f0c (diff) | |
| parent | 0207d6c3b7a2002f15c60d08617e956faf5ba90c (diff) | |
| download | gpu-5f4f61f8a249880c9ab5a1475daf342353c1f91a.tar.gz | |
Merge remote-tracking branch 'partner/upstream' into r35-merge
Bug: 213455888
Signed-off-by: Ankit Goyal <layog@google.com>
Change-Id: Id9ef73da49680e2935a827c40d54169545f7162e
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 1ce806f..7d45a08 100644 --- a/mali_kbase/context/backend/mali_kbase_context_csf.c +++ b/mali_kbase/context/backend/mali_kbase_context_csf.c @@ -48,6 +48,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); |