diff options
| author | Robin Peng <robinpeng@google.com> | 2022-05-16 15:09:47 +0800 |
|---|---|---|
| committer | Robin Peng <robinpeng@google.com> | 2022-05-16 15:09:47 +0800 |
| commit | 1fdbcc986635d9318ccc516844c6ae26086378b4 (patch) | |
| tree | 847c01df5f9d5dd0886bae0d9ddd3fbb0ba7b789 /mali_kbase/mmu | |
| parent | b6c8f73410979eba5342726c3bb361afcd408ae3 (diff) | |
| parent | 5eb4e28d03ffb5e035bf7d39f24d2d0e33daa07f (diff) | |
| download | gpu-1fdbcc986635d9318ccc516844c6ae26086378b4.tar.gz | |
Merge android13-gs-pixel-5.10-gs101 into android13-gs-pixel-5.10
Bug: 211546634
Signed-off-by: Robin Peng <robinpeng@google.com>
Change-Id: I3f37fd8274b8a03c8cb3566792aa683a62d9707d
Diffstat (limited to 'mali_kbase/mmu')
| -rw-r--r-- | mali_kbase/mmu/mali_kbase_mmu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mali_kbase/mmu/mali_kbase_mmu.c b/mali_kbase/mmu/mali_kbase_mmu.c index 6a20a25..8c4dbd7 100644 --- a/mali_kbase/mmu/mali_kbase_mmu.c +++ b/mali_kbase/mmu/mali_kbase_mmu.c @@ -776,7 +776,7 @@ void kbase_mmu_page_fault_worker(struct work_struct *data) #if MALI_JIT_PRESSURE_LIMIT_BASE #if !MALI_USE_CSF - mutex_lock(&kctx->jctx.lock); + rt_mutex_lock(&kctx->jctx.lock); #endif #endif @@ -1198,7 +1198,7 @@ fault_done: kbase_gpu_vm_unlock(kctx); } #if !MALI_USE_CSF - mutex_unlock(&kctx->jctx.lock); + rt_mutex_unlock(&kctx->jctx.lock); #endif #endif @@ -1978,9 +1978,9 @@ kbase_mmu_flush_invalidate(struct kbase_context *kctx, u64 vpfn, size_t nr, kbdev = kctx->kbdev; #if !MALI_USE_CSF - mutex_lock(&kbdev->js_data.queue_mutex); + rt_mutex_lock(&kbdev->js_data.queue_mutex); ctx_is_in_runpool = kbase_ctx_sched_inc_refcount(kctx); - mutex_unlock(&kbdev->js_data.queue_mutex); + rt_mutex_unlock(&kbdev->js_data.queue_mutex); #else ctx_is_in_runpool = kbase_ctx_sched_inc_refcount_if_as_valid(kctx); #endif /* !MALI_USE_CSF */ |