enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1251 from JpegXguy/patch-2

Browse Source 
Fix mali patch for rk3399
This commit is contained in:
Igor Pečovnik 2019-01-28 14:13:30 +01:00 committed by GitHub
commit b6fbfcb058
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
patch/kernel/rk3399-default/04-patch-4.4.167-168_mali.patch
View File

@ -22,19 +22,23 @@ index 4824b316..53b262b5 100644
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..631fb4be 100644
index b6dac558..8362e256 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
@@ -1191,10 +1191,10 @@ static struct kbase_va_region *kbase_mem_from_user_buffer(
@@ -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)
-#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);
+ reg->flags & KBASE_REG_GPU_WR, NULL, NULL);
#else
faulted_pages = get_user_pages(address, *va_pages,
-#else
- faulted_pages = get_user_pages(address, *va_pages,
- reg->flags & KBASE_REG_GPU_WR, 0, NULL, NULL);
+ reg->flags & KBASE_REG_GPU_WR, NULL, NULL);
#endif
-#endif
+ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, NULL, NULL);
+
up_read(&current->mm->mmap_sem);
if (faulted_pages != *va_pages)