diff options
| author | Sidath Senanayake <sidaths@google.com> | 2019-06-27 14:37:54 +0200 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2019-06-27 14:37:54 +0200 |
| commit | 228451ed83f4840e863beff27b33ca9a460f820b (patch) | |
| tree | dd7cbcae7ac302e9d381d95251ad5a0298bec5ae /mali_kbase/mali_kbase_softjobs.c | |
| parent | ac90f0dd5fbae0b94e9720203a8bb2e81fd4b679 (diff) | |
| download | gpu-228451ed83f4840e863beff27b33ca9a460f820b.tar.gz | |
Mali Valhall DDK r19p0 KMD
Provenance:
95928c7e8 (collaborate/EAC/v_r19p0)
VX504X08X-BU-00000-r19p0-01rel0 - Android DDK
NOTE: This is identical to the Bifrost r19p0 KMD as the
only differences between b_r19p0 and v_r19p0 are outside
of the KMD. So as far as the KMD goes, 95928c7e8 and
d441d721a in Collaborate are identical.
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: I261cba9d04daaf8c5ca55e4cb319cf47402dc5f4
Diffstat (limited to 'mali_kbase/mali_kbase_softjobs.c')
| -rw-r--r-- | mali_kbase/mali_kbase_softjobs.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/mali_kbase/mali_kbase_softjobs.c b/mali_kbase/mali_kbase_softjobs.c index 6d0a268..868e1ea 100644 --- a/mali_kbase/mali_kbase_softjobs.c +++ b/mali_kbase/mali_kbase_softjobs.c @@ -1160,15 +1160,15 @@ static int kbase_jit_allocate_process(struct kbase_jd_atom *katom) * Retrieve the mmu flags for JIT allocation * only if dumping is enabled */ - kctx->kbdev->mmu_mode->entry_set_ate(&entry_mmu_flags, - (struct tagged_addr){ 0 }, - reg->flags, - MIDGARD_MMU_BOTTOMLEVEL); + entry_mmu_flags = kbase_mmu_create_ate(kbdev, + (struct tagged_addr){ 0 }, reg->flags, + MIDGARD_MMU_BOTTOMLEVEL, kctx->jit_group_id); #endif KBASE_TLSTREAM_TL_ATTRIB_ATOM_JIT(kbdev, katom, - info->gpu_alloc_addr, - new_addr, entry_mmu_flags, info->id); + info->gpu_alloc_addr, new_addr, info->flags, + entry_mmu_flags, info->id, info->commit_pages, + info->extent, info->va_pages); kbase_vunmap(kctx, &mapping); } @@ -1503,10 +1503,6 @@ int kbase_process_soft_job(struct kbase_jd_atom *katom) break; } #endif - - case BASE_JD_REQ_SOFT_REPLAY: - ret = kbase_replay_process(katom); - break; case BASE_JD_REQ_SOFT_EVENT_WAIT: ret = kbasep_soft_event_wait(katom); break; @@ -1621,8 +1617,6 @@ int kbase_prepare_soft_job(struct kbase_jd_atom *katom) #endif /* CONFIG_SYNC || CONFIG_SYNC_FILE */ case BASE_JD_REQ_SOFT_JIT_ALLOC: return kbase_jit_allocate_prepare(katom); - case BASE_JD_REQ_SOFT_REPLAY: - break; case BASE_JD_REQ_SOFT_JIT_FREE: return kbase_jit_free_prepare(katom); case BASE_JD_REQ_SOFT_EVENT_WAIT: @@ -1715,12 +1709,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); - } else { - KBASE_DEBUG_ASSERT((katom_iter->core_req & - BASE_JD_REQ_SOFT_JOB_TYPE) - != BASE_JD_REQ_SOFT_REPLAY); } - mutex_unlock(&kctx->jctx.lock); } |