mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-28 01:31:35 +00:00
150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
49 lines
2 KiB
Diff
49 lines
2 KiB
Diff
diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem.c b/drivers/gpu/arm/midgard/mali_kbase_mem.c
|
|
index 4a223e8ee..42e0df5db 100644
|
|
--- a/drivers/gpu/arm/midgard/mali_kbase_mem.c
|
|
+++ b/drivers/gpu/arm/midgard/mali_kbase_mem.c
|
|
@@ -2182,14 +2182,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);
|
|
#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
|
|
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);
|
|
#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
|
|
pinned_pages = get_user_pages_remote(NULL, mm,
|
|
address,
|
|
@@ -2201,7 +2201,7 @@ static int kbase_jd_user_buf_map(struct kbase_context *kctx,
|
|
address,
|
|
alloc->imported.user_buf.nr_pages,
|
|
reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0,
|
|
- pages, NULL, NULL);
|
|
+ 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 eea429a8..76610fda 100644
|
|
--- a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
|
|
+++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
|
|
@@ -1161,10 +1161,8 @@ static struct kbase_va_region *kbase_mem_from_user_buffer(
|
|
|
|
#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, pages, NULL);
|
|
-#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
|
|
- faulted_pages = get_user_pages(address, *va_pages,
|
|
- reg->flags & KBASE_REG_GPU_WR, 0, pages, NULL);
|
|
+ reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0,
|
|
+ pages, NULL);
|
|
#else
|
|
faulted_pages = get_user_pages(address, *va_pages,
|
|
reg->flags & KBASE_REG_GPU_WR ? FOLL_WRITE : 0,
|