diff options
| author | Sidath Senanayake <sidaths@google.com> | 2019-08-23 15:40:27 +0200 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2019-08-23 15:40:27 +0200 |
| commit | 869660680efaed77cec0414161640a6f1a85d5b2 (patch) | |
| tree | d36678f523da5f9148c465c3b5d5ef058401a409 /mali_kbase/mali_kbase_mem.c | |
| parent | 228451ed83f4840e863beff27b33ca9a460f820b (diff) | |
| download | gpu-869660680efaed77cec0414161640a6f1a85d5b2.tar.gz | |
Mali Valhall DDK r20p0 KMD
Provenance:
f3deff212 (collaborate/EAC/v_r20p0)
VX504X08X-BU-00000-r20p0-01rel0 - Android DDK
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: If3c1611d83966bcb25a85ad27638612c121cb545
Diffstat (limited to 'mali_kbase/mali_kbase_mem.c')
| -rw-r--r-- | mali_kbase/mali_kbase_mem.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/mali_kbase/mali_kbase_mem.c b/mali_kbase/mali_kbase_mem.c index f55d8ea..fa05f34 100644 --- a/mali_kbase/mali_kbase_mem.c +++ b/mali_kbase/mali_kbase_mem.c @@ -26,9 +26,7 @@ * @file mali_kbase_mem.c * Base kernel memory APIs */ -#ifdef CONFIG_DMA_SHARED_BUFFER #include <linux/dma-buf.h> -#endif /* CONFIG_DMA_SHARED_BUFFER */ #include <linux/kernel.h> #include <linux/bug.h> #include <linux/compat.h> @@ -2504,7 +2502,6 @@ void kbase_mem_kref_free(struct kref *kref) case KBASE_MEM_TYPE_RAW: /* raw pages, external cleanup */ break; -#ifdef CONFIG_DMA_SHARED_BUFFER case KBASE_MEM_TYPE_IMPORTED_UMM: if (!IS_ENABLED(CONFIG_MALI_DMA_BUF_MAP_ON_DEMAND)) { WARN_ONCE(alloc->imported.umm.current_mapping_usage_count != 1, @@ -2519,7 +2516,6 @@ void kbase_mem_kref_free(struct kref *kref) alloc->imported.umm.dma_attachment); dma_buf_put(alloc->imported.umm.dma_buf); break; -#endif case KBASE_MEM_TYPE_IMPORTED_USER_BUF: if (alloc->imported.user_buf.mm) mmdrop(alloc->imported.user_buf.mm); @@ -2659,8 +2655,8 @@ bool kbase_check_import_flags(unsigned long flags) if ((flags & (BASE_MEM_PROT_GPU_RD | BASE_MEM_PROT_GPU_WR)) == 0) return false; - /* Secure memory cannot be read by the CPU */ - if ((flags & BASE_MEM_SECURE) && (flags & BASE_MEM_PROT_CPU_RD)) + /* Protected memory cannot be read by the CPU */ + if ((flags & BASE_MEM_PROTECTED) && (flags & BASE_MEM_PROT_CPU_RD)) return false; return true; @@ -3733,14 +3729,12 @@ struct kbase_mem_phy_alloc *kbase_map_external_resource( } } break; -#ifdef CONFIG_DMA_SHARED_BUFFER case KBASE_MEM_TYPE_IMPORTED_UMM: { err = kbase_mem_umm_map(kctx, reg); if (err) goto exit; break; } -#endif default: goto exit; } @@ -3754,12 +3748,10 @@ void kbase_unmap_external_resource(struct kbase_context *kctx, struct kbase_va_region *reg, struct kbase_mem_phy_alloc *alloc) { switch (alloc->type) { -#ifdef CONFIG_DMA_SHARED_BUFFER case KBASE_MEM_TYPE_IMPORTED_UMM: { kbase_mem_umm_unmap(kctx, reg, alloc); } break; -#endif /* CONFIG_DMA_SHARED_BUFFER */ case KBASE_MEM_TYPE_IMPORTED_USER_BUF: { alloc->imported.user_buf.current_mapping_usage_count--; |