diff options
| author | Sidath Senanayake <sidaths@google.com> | 2021-06-15 13:39:30 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2021-06-15 14:11:16 +0100 |
| commit | fca8613cfcf585bf9113dca96a05daea9fd89794 (patch) | |
| tree | f2baa14910f83edf00450bc30d3703eb255a0bba /mali_kbase/mali_kbase_mem_linux.c | |
| parent | 8037b534570814775d79aeddd06b76e5ee941f59 (diff) | |
| download | gpu-fca8613cfcf585bf9113dca96a05daea9fd89794.tar.gz | |
Mali Valhall DDK r31p0 KMD
Provenance: 2ea0ef9bd (collaborate/EAC/v_r31p0)
VX504X08X-BU-00000-r31p0-01eac0 - Valhall Android DDK
VX504X08X-BU-60000-r31p0-01eac0 - Valhall Android Document Bundle
VX504X08X-DC-11001-r31p0-01eac0 - Valhall Android DDK Software Errata
VX504X08X-SW-99006-r31p0-01eac0 - Valhall Android Renderscript AOSP parts
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Ide9d5fdc6d9c95fa66a3546b01f619b43c09496d
Diffstat (limited to 'mali_kbase/mali_kbase_mem_linux.c')
| -rw-r--r-- | mali_kbase/mali_kbase_mem_linux.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mali_kbase/mali_kbase_mem_linux.c b/mali_kbase/mali_kbase_mem_linux.c index 7c9c08e..cc80927 100644 --- a/mali_kbase/mali_kbase_mem_linux.c +++ b/mali_kbase/mali_kbase_mem_linux.c @@ -42,7 +42,7 @@ #include <mali_kbase.h> #include <mali_kbase_mem_linux.h> #include <tl/mali_kbase_tracepoints.h> -#include <mali_kbase_ioctl.h> +#include <uapi/gpu/arm/midgard/mali_kbase_ioctl.h> #include <mmu/mali_kbase_mmu.h> #include <mali_kbase_caps.h> #include <mali_kbase_trace_gpu_mem.h> @@ -1104,7 +1104,7 @@ int kbase_mem_do_sync_imported(struct kbase_context *kctx, dir); #endif /* KBASE_MEM_ION_SYNC_WORKAROUND */ break; - }; + } if (unlikely(ret)) dev_warn(kctx->kbdev->dev, @@ -2718,7 +2718,7 @@ int kbase_context_mmap(struct kbase_context *const kctx, { struct kbase_va_region *reg = NULL; void *kaddr = NULL; - size_t nr_pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; + size_t nr_pages = vma_pages(vma); int err = 0; int free_on_close = 0; struct device *dev = kctx->kbdev->dev; @@ -3333,7 +3333,7 @@ static int kbase_csf_cpu_mmap_user_io_pages(struct kbase_context *kctx, { unsigned long cookie = vma->vm_pgoff - PFN_DOWN(BASEP_MEM_CSF_USER_IO_PAGES_HANDLE); - size_t nr_pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; + size_t nr_pages = vma_pages(vma); struct kbase_queue *queue; int err = 0; |