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

Commit 70addd3e 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: Correct memory type update in IOCTL_KGSL_GPUOBJ_SET_INFO"

parents 5b3b54ef 7d13ed2b

drivers/gpu/msm/kgsl.c

+8 −4
Original line number Diff line number Diff line
@@ -4039,6 +4039,7 @@ long kgsl_ioctl_gpuobj_set_info(struct kgsl_device_private *dev_priv, 
	struct kgsl_process_private *private = dev_priv->process_priv;

	struct kgsl_gpuobj_set_info *param = data;

	struct kgsl_mem_entry *entry;

	int ret = 0;



	if (param->id == 0)

		return -EINVAL;
@@ -4051,13 +4052,16 @@ long kgsl_ioctl_gpuobj_set_info(struct kgsl_device_private *dev_priv, 
		copy_metadata(entry, param->metadata, param->metadata_len);



	if (param->flags & KGSL_GPUOBJ_SET_INFO_TYPE) {

		if (param->type <= (KGSL_MEMTYPE_MASK >> KGSL_MEMTYPE_SHIFT)) {

			entry->memdesc.flags &= ~((uint64_t) KGSL_MEMTYPE_MASK);

		entry->memdesc.flags |= (uint64_t)(param->type <<

						KGSL_MEMTYPE_SHIFT);

			entry->memdesc.flags |= (uint64_t)((param->type <<

				KGSL_MEMTYPE_SHIFT) & KGSL_MEMTYPE_MASK);

		} else

			ret = -EINVAL;

	}



	kgsl_mem_entry_put(entry);

	return 0;

	return ret;

}



/**