Merge "msm: kgsl: Use only compat VA range for compat tasks" (ab68b85a) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/msm/adreno_a6xx_preempt.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -749,6 +749,9 @@ int a6xx_preemption_context_init(struct kgsl_context *context)
		if (context->flags & KGSL_CONTEXT_SECURE)
		flags \|= KGSL_MEMFLAGS_SECURE;

		if (kgsl_is_compat_task())
		flags \|= KGSL_MEMFLAGS_FORCE_32BIT;

		/*
		* gpumem_alloc_entry takes an extra refcount. Put it only when
		* destroying the context to keep the context record valid

drivers/gpu/msm/kgsl.c

+15 −4

Original line number	Diff line number	Diff line
		@@ -2402,6 +2402,9 @@ long kgsl_ioctl_gpuobj_import(struct kgsl_device_private *dev_priv,
		if (!MMU_FEATURE(mmu, KGSL_MMU_IO_COHERENT))
		param->flags &= ~((uint64_t)KGSL_MEMFLAGS_IOCOHERENT);

		if (kgsl_is_compat_task())
		param->flags \|= KGSL_MEMFLAGS_FORCE_32BIT;

		entry->memdesc.flags = param->flags;

		if (MMU_FEATURE(mmu, KGSL_MMU_NEED_GUARD_PAGE))
		@@ -2692,8 +2695,10 @@ long kgsl_ioctl_map_user_mem(struct kgsl_device_private *dev_priv,
		if (!MMU_FEATURE(mmu, KGSL_MMU_IO_COHERENT))
		param->flags &= ~((uint64_t)KGSL_MEMFLAGS_IOCOHERENT);

		entry->memdesc.flags = ((uint64_t) param->flags)
		\| KGSL_MEMFLAGS_FORCE_32BIT;
		entry->memdesc.flags = (uint64_t) param->flags;

		if (kgsl_is_compat_task())
		entry->memdesc.flags \|= KGSL_MEMFLAGS_FORCE_32BIT;

		if (!kgsl_mmu_use_cpu_map(mmu))
		entry->memdesc.flags &= ~((uint64_t) KGSL_MEMFLAGS_USE_CPU_MAP);
		@@ -3197,6 +3202,9 @@ long kgsl_ioctl_gpuobj_alloc(struct kgsl_device_private *dev_priv,
		struct kgsl_gpuobj_alloc *param = data;
		struct kgsl_mem_entry *entry;

		if (kgsl_is_compat_task())
		param->flags \|= KGSL_MEMFLAGS_FORCE_32BIT;

		entry = gpumem_alloc_entry(dev_priv, param->size, param->flags);

		if (IS_ERR(entry))
		@@ -3224,6 +3232,8 @@ long kgsl_ioctl_gpumem_alloc(struct kgsl_device_private *dev_priv,

		/* Legacy functions doesn't support these advanced features */
		flags &= ~((uint64_t) KGSL_MEMFLAGS_USE_CPU_MAP);

		if (kgsl_is_compat_task())
		flags \|= KGSL_MEMFLAGS_FORCE_32BIT;

		entry = gpumem_alloc_entry(dev_priv, (uint64_t) param->size, flags);
		@@ -3248,6 +3258,7 @@ long kgsl_ioctl_gpumem_alloc_id(struct kgsl_device_private *dev_priv,
		struct kgsl_mem_entry *entry;
		uint64_t flags = param->flags;

		if (kgsl_is_compat_task())
		flags \|= KGSL_MEMFLAGS_FORCE_32BIT;

		entry = gpumem_alloc_entry(dev_priv, (uint64_t) param->size, flags);

drivers/gpu/msm/kgsl.h

+7 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2008-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2008-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -27,6 +27,7 @@
		#include <linux/uaccess.h>
		#include <linux/kthread.h>
		#include <asm/cacheflush.h>
		#include <linux/compat.h>

		/*
		* --- kgsl drawobj flags ---
		@@ -628,4 +629,9 @@ static inline void kgsl_gpu_sysfs_add_link(struct kobject *dst,

		kernfs_create_link(dst->sd, dst_name, old);
		}

		static inline bool kgsl_is_compat_task(void)
		{
		return (BITS_PER_LONG == 32) \|\| is_compat_task();
		}
		#endif /* __KGSL_H */

drivers/gpu/msm/kgsl_iommu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1052,7 +1052,7 @@ static void setup_64bit_pagetable(struct kgsl_mmu *mmu,

		if (pagetable->name != KGSL_MMU_GLOBAL_PT &&
		pagetable->name != KGSL_MMU_SECURE_PT) {
		if ((BITS_PER_LONG == 32) \|\| is_compat_task()) {
		if (kgsl_is_compat_task()) {
		pt->svm_start = KGSL_IOMMU_SVM_BASE32;
		pt->svm_end = KGSL_IOMMU_SECURE_BASE(mmu);
		} else {