diff options
| author | Sidath Senanayake <sidaths@google.com> | 2018-04-27 13:23:04 +0200 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2018-04-27 13:23:04 +0200 |
| commit | 3fe808a3e4ba33fa6fc47255b6ec14611e8ef8de (patch) | |
| tree | 8a23baaae16dae4ca0431e002cb736a1034039c2 /mali_kbase/mali_kbase_softjobs.c | |
| parent | 8946bcdee4c36dbc82b8c2a2abcf9c2f5eab5ae0 (diff) | |
| download | gpu-3fe808a3e4ba33fa6fc47255b6ec14611e8ef8de.tar.gz | |
Mali Bifrost DDK r12p0 KMD
Provenance:
875d9aa9b (collaborate/EAC/b_r12p0)
BX304L01B-BU-00000-r12p0-01rel0
BX304L06A-BU-00000-r12p0-01rel0
BX304X07X-BU-00000-r12p0-01rel0
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Id91cbb43f407e908f71a977fd139ea1e3a4f6b6f
Diffstat (limited to 'mali_kbase/mali_kbase_softjobs.c')
| -rw-r--r-- | mali_kbase/mali_kbase_softjobs.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/mali_kbase/mali_kbase_softjobs.c b/mali_kbase/mali_kbase_softjobs.c index 01bfebc..01b3087 100644 --- a/mali_kbase/mali_kbase_softjobs.c +++ b/mali_kbase/mali_kbase_softjobs.c @@ -691,13 +691,6 @@ static int kbase_debug_copy_prepare(struct kbase_jd_atom *katom) ret = 0; break; } - case KBASE_MEM_TYPE_IMPORTED_UMP: - { - dev_warn(katom->kctx->kbdev->dev, - "UMP is not supported for debug_copy jobs\n"); - ret = -EINVAL; - goto out_unlock; - } default: /* Nothing to be done. */ break; @@ -971,7 +964,8 @@ fail: static u8 kbase_jit_free_get_id(struct kbase_jd_atom *katom) { - if (WARN_ON(katom->core_req != BASE_JD_REQ_SOFT_JIT_FREE)) + if (WARN_ON((katom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) != + BASE_JD_REQ_SOFT_JIT_FREE)) return 0; return (u8) katom->jc; @@ -1017,7 +1011,8 @@ static int kbase_jit_allocate_process(struct kbase_jd_atom *katom) list_for_each_entry(jit_atom, &kctx->jit_atoms_head, jit_node) { if (jit_atom == katom) break; - if (jit_atom->core_req == BASE_JD_REQ_SOFT_JIT_FREE) { + if ((jit_atom->core_req & BASE_JD_REQ_SOFT_JOB_TYPE) == + BASE_JD_REQ_SOFT_JIT_FREE) { u8 free_id = kbase_jit_free_get_id(jit_atom); if (free_id && kctx->jit_alloc[free_id]) { |