Merge "msm: kgsl: Change struct pointers to void pointers" (75bb6b02) · Commits · e / devices / android_kernel_sony_msm8994

drivers/gpu/msm/kgsl.c

+6 −8

Original line number	Diff line number	Diff line
		@@ -1959,11 +1959,9 @@ static struct kgsl_cmdbatch *_kgsl_cmdbatch_create_legacy(
		* Create a command batch from the standard issueibcmds format sent by the user.
		*/
		static struct kgsl_cmdbatch _kgsl_cmdbatch_create(struct kgsl_device device,
		struct kgsl_context *context,
		unsigned int flags,
		struct kgsl_ibdesc __user *cmdlist, unsigned int numcmds,
		struct kgsl_cmd_syncpoint __user *synclist,
		unsigned int numsyncs)
		struct kgsl_context *context, unsigned int flags,
		void __user *cmdlist, unsigned int numcmds,
		void __user *synclist, unsigned int numsyncs)
		{
		struct kgsl_cmdbatch *cmdbatch =
		kgsl_cmdbatch_create(device, context, flags, numcmds);
		@@ -1973,7 +1971,7 @@ static struct kgsl_cmdbatch _kgsl_cmdbatch_create(struct kgsl_device device,
		return cmdbatch;

		if (!(flags & KGSL_CONTEXT_SYNC)) {
		if (copy_from_user(cmdbatch->ibdesc, (void __user *) cmdlist,
		if (copy_from_user(cmdbatch->ibdesc, cmdlist,
		sizeof(struct kgsl_ibdesc) * numcmds)) {
		ret = -EFAULT;
		goto done;
		@@ -1982,7 +1980,7 @@ static struct kgsl_cmdbatch _kgsl_cmdbatch_create(struct kgsl_device device,

		if (synclist && numsyncs) {
		struct kgsl_cmd_syncpoint sync;
		void __user uptr = (void __user ) synclist;
		void __user *uptr = synclist;
		int i;

		for (i = 0; i < numsyncs; i++) {
		@@ -2039,7 +2037,7 @@ static long kgsl_ioctl_rb_issueibcmds(struct kgsl_device_private *dev_priv,
		goto done;

		cmdbatch = _kgsl_cmdbatch_create(device, context, param->flags,
		(struct kgsl_ibdesc __user *)param->ibdesc_addr,
		(void __user *)param->ibdesc_addr,
		param->numibs, 0, 0);
		} else
		cmdbatch = _kgsl_cmdbatch_create_legacy(device, context, param);