From 125c5d5b5abe12bd3f0da2266b3f3c3854f3256b Mon Sep 17 00:00:00 2001 From: Leonidas P <29687487+JpegXguy@users.noreply.github.com> Date: Thu, 31 Jan 2019 20:23:11 +0200 Subject: [PATCH] Fix rk3399-default mali patch Now correct fot 4.9+ also (if it's ever needed) --- .../04-patch-4.4.167-168_mali.patch | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/patch/kernel/rk3399-default/04-patch-4.4.167-168_mali.patch b/patch/kernel/rk3399-default/04-patch-4.4.167-168_mali.patch index 02288bfe4a..0abd48ad39 100644 --- a/patch/kernel/rk3399-default/04-patch-4.4.167-168_mali.patch +++ b/patch/kernel/rk3399-default/04-patch-4.4.167-168_mali.patch @@ -22,23 +22,19 @@ 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..8362e256 100644 +index b6dac558..287e09b6 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 */ +@@ -1191,10 +1191,10 @@ static struct kbase_va_region *kbase_mem_from_user_buffer( /* (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); --#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); -+ + #else + faulted_pages = get_user_pages(address, *va_pages, +- reg->flags & KBASE_REG_GPU_WR, 0, NULL, NULL); ++ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0, NULL, NULL); + #endif up_read(¤t->mm->mmap_sem); - if (faulted_pages != *va_pages)