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_softjobs.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_softjobs.c')
| -rw-r--r-- | mali_kbase/mali_kbase_softjobs.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mali_kbase/mali_kbase_softjobs.c b/mali_kbase/mali_kbase_softjobs.c index 868e1ea..88773cc 100644 --- a/mali_kbase/mali_kbase_softjobs.c +++ b/mali_kbase/mali_kbase_softjobs.c @@ -24,10 +24,8 @@ #include <mali_kbase.h> -#if defined(CONFIG_DMA_SHARED_BUFFER) #include <linux/dma-buf.h> #include <asm/cacheflush.h> -#endif /* defined(CONFIG_DMA_SHARED_BUFFER) */ #if defined(CONFIG_SYNC) || defined(CONFIG_SYNC_FILE) #include <mali_kbase_sync.h> #endif @@ -774,9 +772,7 @@ int kbase_mem_copy_from_extres(struct kbase_context *kctx, size_t to_copy = min(extres_size, buf_data->size); struct kbase_mem_phy_alloc *gpu_alloc = buf_data->gpu_alloc; int ret = 0; -#ifdef CONFIG_DMA_SHARED_BUFFER size_t dma_to_copy; -#endif KBASE_DEBUG_ASSERT(pages != NULL); @@ -807,7 +803,6 @@ int kbase_mem_copy_from_extres(struct kbase_context *kctx, break; } break; -#ifdef CONFIG_DMA_SHARED_BUFFER case KBASE_MEM_TYPE_IMPORTED_UMM: { struct dma_buf *dma_buf = gpu_alloc->imported.umm.dma_buf; @@ -847,7 +842,6 @@ int kbase_mem_copy_from_extres(struct kbase_context *kctx, DMA_FROM_DEVICE); break; } -#endif default: ret = -EINVAL; } |