diff options
| author | Sidath Senanayake <sidaths@google.com> | 2020-11-25 16:47:38 +0000 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2020-11-25 16:47:38 +0000 |
| commit | 86ef494fcee7e40a37d17b101883d8beea42acf2 (patch) | |
| tree | 8ae28a633b3f5b2b117edef6138ae82571155312 /mali_kbase/mali_kbase_softjobs.c | |
| parent | ef7db1a858a7c156d6310d11d04efbaf7e216bf6 (diff) | |
| parent | 72f2457ff7355ff0389efe5bc9cec3365362d8c4 (diff) | |
| download | gpu-86ef494fcee7e40a37d17b101883d8beea42acf2.tar.gz | |
Merge r27p0 from upstream into android-gs-pixel-mainline
This commit updates the Mali KMD to version r27p0 from
commit 72f2457ff7355ff0389efe5bc9cec3365362d8c4
Bug: 171747612
Change-Id: Ida619c400a9652ebbbc871e2c973d3c78fc5de62
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 8176d7f..95323f7 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 */ |