21125280db
No need to check linux version anymore, function call is the same. Try to see if it builds
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.c b/drivers/gpu/arm/midgard/mali_kbase_mem.c
|
|
index 4824b316..53b262b5 100644
|
|
--- a/drivers/gpu/arm/midgard/mali_kbase_mem.c
|
|
+++ b/drivers/gpu/arm/midgard/mali_kbase_mem.c
|
|
@@ -2041,14 +2041,14 @@ static int kbase_jd_user_buf_map(struct kbase_context *kctx,
|
|
pinned_pages = get_user_pages(NULL, mm,
|
|
address,
|
|
alloc->imported.user_buf.nr_pages,
|
|
- reg->flags & KBASE_REG_GPU_WR,
|
|
- 0, pages, NULL);
|
|
+ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0,
|
|
+ pages, NULL);
|
|
#else
|
|
pinned_pages = get_user_pages_remote(NULL, mm,
|
|
address,
|
|
alloc->imported.user_buf.nr_pages,
|
|
- reg->flags & KBASE_REG_GPU_WR,
|
|
- 0, pages, NULL);
|
|
+ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0,
|
|
+ pages, NULL);
|
|
#endif
|
|
|
|
if (pinned_pages <= 0)
|
|
diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
|
|
index b6dac558..8362e256 100644
|
|
--- a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
|
|
+++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
|
|
@@ -1189,13 +1189,10 @@ static struct kbase_va_region *kbase_mem_from_user_buffer(
|
|
/* We can't really store the page list because that would involve */
|
|
/* keeping the pages pinned - instead we pin/unpin around the job */
|
|
/* (as part of the external resources handling code) */
|
|
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
|
|
+
|
|
faulted_pages = get_user_pages(current, current->mm, address, *va_pages,
|
|
- reg->flags & KBASE_REG_GPU_WR, 0, NULL, NULL);
|
|
-#else
|
|
- faulted_pages = get_user_pages(address, *va_pages,
|
|
- reg->flags & KBASE_REG_GPU_WR, 0, NULL, NULL);
|
|
-#endif
|
|
+ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, NULL, NULL);
|
|
+
|
|
up_read(¤t->mm->mmap_sem);
|
|
|
|
if (faulted_pages != *va_pages)
|