diff options
| author | Sidath Senanayake <sidaths@google.com> | 2020-10-27 11:38:49 +0000 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2020-10-27 11:38:49 +0000 |
| commit | 72f2457ff7355ff0389efe5bc9cec3365362d8c4 (patch) | |
| tree | 8f5fb993bd2a8eb181c880b180b6401b46f76620 /mali_kbase/mali_kbase_softjobs.c | |
| parent | d4ca6eb7268ee2db9deabd1745b505c6e1c162f9 (diff) | |
| download | gpu-72f2457ff7355ff0389efe5bc9cec3365362d8c4.tar.gz | |
Mali Valhall DDK r27p0 KMD
Provenance:
7e6f74ec1 (collaborate/EAC/v_r27p0)
VX504X08X-BU-00000-r27p0-01eac0 - Android DDK
VX504X08X-SW-99006-r27p0-01eac0 - Android Renderscript AOSP parts
VX504X08X-BU-60000-r27p0-01eac0 - Android Document Bundle
VX504X08X-DC-11001-r27p0-01eac0 - Valhall Android DDK Software Errata
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Ib59de731b034cc7e2631e35f1b0063b8f6894ecc
Diffstat (limited to 'mali_kbase/mali_kbase_softjobs.c')
| -rw-r--r-- | mali_kbase/mali_kbase_softjobs.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mali_kbase/mali_kbase_softjobs.c b/mali_kbase/mali_kbase_softjobs.c index 7a784ac..ef5da68 100644 --- a/mali_kbase/mali_kbase_softjobs.c +++ b/mali_kbase/mali_kbase_softjobs.c @@ -43,6 +43,7 @@ #include <linux/kernel.h> #include <linux/cache.h> +#if !MALI_USE_CSF /** * @file mali_kbase_softjobs.c * @@ -720,6 +721,7 @@ out_cleanup: return ret; } +#endif /* !MALI_USE_CSF */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) static void *dma_buf_kmap_page(struct kbase_mem_phy_alloc *gpu_alloc, @@ -847,6 +849,7 @@ out_unlock: return ret; } +#if !MALI_USE_CSF static int kbase_debug_copy(struct kbase_jd_atom *katom) { struct kbase_debug_copy_buffer *buffers = katom->softjob_data; @@ -864,6 +867,7 @@ static int kbase_debug_copy(struct kbase_jd_atom *katom) return 0; } +#endif /* !MALI_USE_CSF */ #define KBASEP_JIT_ALLOC_GPU_ADDR_ALIGNMENT ((u32)0x7) @@ -908,16 +912,19 @@ int kbasep_jit_alloc_validate(struct kbase_context *kctx, return -EINVAL; #endif +#if !MALI_USE_CSF /* If BASE_JIT_ALLOC_HEAP_INFO_IS_SIZE is set, heap_info_gpu_addr * cannot be 0 */ if ((info->flags & BASE_JIT_ALLOC_HEAP_INFO_IS_SIZE) && !info->heap_info_gpu_addr) return -EINVAL; +#endif /* !MALI_USE_CSF */ return 0; } +#if !MALI_USE_CSF #if (KERNEL_VERSION(3, 18, 63) > LINUX_VERSION_CODE) #define offsetofend(TYPE, MEMBER) \ @@ -1795,3 +1802,4 @@ void kbase_resume_suspended_soft_jobs(struct kbase_device *kbdev) if (resched) kbase_js_sched_all(kbdev); } +#endif /* !MALI_USE_CSF */ |