diff options
| author | Siddharth Kapoor <ksiddharth@google.com> | 2022-03-15 20:55:10 +0800 |
|---|---|---|
| committer | Siddharth Kapoor <ksiddharth@google.com> | 2022-03-23 23:13:16 +0800 |
| commit | 0b2458bd7089baefcf19906e32dffec3cf6af500 (patch) | |
| tree | 61beb8549e7bb3d2582268e2aa982d79b98e2548 /mali_kbase/mali_kbase_softjobs.c | |
| parent | 3d9f70261b023712c5113fb715f114ad8db9cfae (diff) | |
| parent | 88d7d984fed1c2a4358ce2bbc334e82d71e3a391 (diff) | |
| download | gpu-0b2458bd7089baefcf19906e32dffec3cf6af500.tar.gz | |
Merge r36p0 from upstream into android-gs-pixel-5.10-gs101
Bug: 220942030
Test: boot to Home, Camera, Video, Chrome
Signed-off-by: Siddharth Kapoor <ksiddharth@google.com>
Change-Id: I8cf3a6243b092a05299acf956f5293facd1ed3cc
Diffstat (limited to 'mali_kbase/mali_kbase_softjobs.c')
| -rw-r--r-- | mali_kbase/mali_kbase_softjobs.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/mali_kbase/mali_kbase_softjobs.c b/mali_kbase/mali_kbase_softjobs.c index 5f74247..1f8f7d8 100644 --- a/mali_kbase/mali_kbase_softjobs.c +++ b/mali_kbase/mali_kbase_softjobs.c @@ -215,7 +215,7 @@ void kbase_soft_event_wait_callback(struct kbase_jd_atom *katom) mutex_lock(&kctx->jctx.lock); kbasep_remove_waiting_soft_job(katom); kbase_finish_soft_job(katom); - if (jd_done_nolock(katom, NULL)) + if (jd_done_nolock(katom, true)) kbase_js_sched_all(kctx->kbdev); mutex_unlock(&kctx->jctx.lock); } @@ -229,7 +229,7 @@ static void kbasep_soft_event_complete_job(struct kthread_work *work) int resched; mutex_lock(&kctx->jctx.lock); - resched = jd_done_nolock(katom, NULL); + resched = jd_done_nolock(katom, true); mutex_unlock(&kctx->jctx.lock); if (resched) @@ -307,7 +307,7 @@ static void kbase_fence_debug_check_atom(struct kbase_jd_atom *katom) info.fence, info.name, kbase_sync_status_string(info.status)); - } + } } kbase_fence_debug_check_atom(dep); @@ -500,7 +500,7 @@ out: static void kbasep_soft_event_cancel_job(struct kbase_jd_atom *katom) { katom->event_code = BASE_JD_EVENT_JOB_CANCELLED; - if (jd_done_nolock(katom, NULL)) + if (jd_done_nolock(katom, true)) kbase_js_sched_all(katom->kctx->kbdev); } @@ -1357,7 +1357,7 @@ static void kbasep_jit_finish_worker(struct kthread_work *work) mutex_lock(&kctx->jctx.lock); kbase_finish_soft_job(katom); - resched = jd_done_nolock(katom, NULL); + resched = jd_done_nolock(katom, true); mutex_unlock(&kctx->jctx.lock); if (resched) @@ -1397,9 +1397,8 @@ static void kbase_jit_free_finish(struct kbase_jd_atom *katom) lockdep_assert_held(&kctx->jctx.lock); ids = kbase_jit_free_get_ids(katom); - if (WARN_ON(ids == NULL)) { + if (WARN_ON(ids == NULL)) return; - } /* Remove this atom from the jit_atoms_head list */ list_del(&katom->jit_node); @@ -1798,7 +1797,7 @@ void kbase_resume_suspended_soft_jobs(struct kbase_device *kbdev) if (kbase_process_soft_job(katom_iter) == 0) { kbase_finish_soft_job(katom_iter); - resched |= jd_done_nolock(katom_iter, NULL); + resched |= jd_done_nolock(katom_iter, true); #ifdef CONFIG_MALI_ARBITER_SUPPORT atomic_dec(&kbdev->pm.gpu_users_waiting); #endif /* CONFIG_MALI_ARBITER_SUPPORT */ |