Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c192a74a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Allow IOCTL_KGSL_GPUOBJ_IMPORT to force 32 bit allocations"

parents f42ed0df 4dc6f9f3

drivers/gpu/msm/kgsl.c

+4 −2
Original line number Diff line number Diff line
@@ -2146,7 +2146,8 @@ static long _gpuobj_map_useraddr(struct kgsl_device *device, 


	param->flags &= KGSL_MEMFLAGS_GPUREADONLY

		| KGSL_CACHEMODE_MASK

		| KGSL_MEMTYPE_MASK;

		| KGSL_MEMTYPE_MASK

		| KGSL_MEMFLAGS_FORCE_32BIT;



	/* Specifying SECURE is an explicit error */

	if (param->flags & KGSL_MEMFLAGS_SECURE)
@@ -2238,7 +2239,8 @@ long kgsl_ioctl_gpuobj_import(struct kgsl_device_private *dev_priv, 
			| KGSL_MEMTYPE_MASK

			| KGSL_MEMALIGN_MASK

			| KGSL_MEMFLAGS_USE_CPU_MAP

			| KGSL_MEMFLAGS_SECURE;

			| KGSL_MEMFLAGS_SECURE

			| KGSL_MEMFLAGS_FORCE_32BIT;



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