GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-04-01 11:41:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix rockchip-default mali patch

Browse source
This commit is contained in:
Leonidas P 2019-01-31 19:54:49 +02:00 • committed by GitHub
parent 556eb213c1
commit a4d2b0f870
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
patch/kernel/rockchip-default/04-patch-4.4.167-168_mali.patch
View file

@ -31,24 +31,19 @@ index 4a223e8ee..42e0df5db 100644
if (pinned_pages <= 0) 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 diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
index eea429a8d..23152f076 100644 index eea429a8..76610fda 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c --- a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c +++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
@@ -1161,14 +1161,13 @@ static struct kbase_va_region *kbase_mem_from_user_buffer( @@ -1161,10 +1161,8 @@ static struct kbase_va_region *kbase_mem_from_user_buffer(
#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, faulted_pages = get_user_pages(current, current->mm, address, *va_pages,
- reg->flags & KBASE_REG_GPU_WR, 0, pages, NULL); - reg->flags & KBASE_REG_GPU_WR, 0, pages, NULL);
+ reg->flags & KBASE_REG_GPU_WR, NULL, NULL); -#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) - faulted_pages = get_user_pages(address, *va_pages,
faulted_pages = get_user_pages(address, *va_pages,
- reg->flags & KBASE_REG_GPU_WR, 0, pages, NULL); - reg->flags & KBASE_REG_GPU_WR, 0, pages, NULL);
+ reg->flags & KBASE_REG_GPU_WR, NULL, NULL); + reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0,
+ pages, NULL);
#else #else
faulted_pages = get_user_pages(address, *va_pages, faulted_pages = get_user_pages(address, *va_pages,
- reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0,
- pages, NULL);
+ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, NULL);
#endif
up_read(&current->mm->mmap_sem);