Attachment #253847 for bug #344889

Lines 595-601 Link Here

(-)psb-kernel-source-4.41.1/drm_drv.c.old (-1 / +1 lines)
595	* byte stack buffer to store the ioctl arguments in kernel space. Should we	595	* byte stack buffer to store the ioctl arguments in kernel space. Should we
596	* ever need much larger ioctl arguments, we may need to allocate memory.	596	* ever need much larger ioctl arguments, we may need to allocate memory.
597	*/	597	*/
598	int drm_ioctl(struct inode inode, struct file filp,	598	long drm_ioctl(struct file *filp,
599	unsigned int cmd, unsigned long arg)	599	unsigned int cmd, unsigned long arg)
600	{	600	{
601	return psb_drm_unlocked_ioctl(filp, cmd, arg);	601	return psb_drm_unlocked_ioctl(filp, cmd, arg);

Lines 944-950 Link Here

(-)psb-kernel-source-4.41.1/drmP.h.old (-1 / +1 lines)
944	struct pci_device_id *pciidlist);	944	struct pci_device_id *pciidlist);
945	extern void drm_exit(struct drm_driver *driver);	945	extern void drm_exit(struct drm_driver *driver);
946	extern void drm_cleanup_pci(struct pci_dev *pdev);	946	extern void drm_cleanup_pci(struct pci_dev *pdev);
947	extern int drm_ioctl(struct inode inode, struct file filp,	947	extern long drm_ioctl(struct file *filp,
948	unsigned int cmd, unsigned long arg);	948	unsigned int cmd, unsigned long arg);
949	extern long drm_unlocked_ioctl(struct file *filp,	949	extern long drm_unlocked_ioctl(struct file *filp,
950	unsigned int cmd, unsigned long arg);	950	unsigned int cmd, unsigned long arg);

Lines 555-561 Link Here

(-)psb-kernel-source-4.41.1/i915_drv.c.old (-1 / +1 lines)
555	.owner = THIS_MODULE,	555	.owner = THIS_MODULE,
556	.open = drm_open,	556	.open = drm_open,
557	.release = drm_release,	557	.release = drm_release,
558	.ioctl = drm_ioctl,	558	.unlocked_ioctl = drm_ioctl,
559	.mmap = drm_mmap,	559	.mmap = drm_mmap,
560	.poll = drm_poll,	560	.poll = drm_poll,
561	.fasync = drm_fasync,	561	.fasync = drm_fasync,




			  &batchbuffer->cliprects))
		return -EFAULT;

	return drm_ioctl(file,
			 DRM_IOCTL_I915_BATCHBUFFER,
			 (unsigned long) batchbuffer);
}

			  &cmdbuffer->cliprects))
		return -EFAULT;

	return drm_ioctl(file,
			 DRM_IOCTL_I915_CMDBUFFER, (unsigned long) cmdbuffer);
}


			  &request->irq_seq))
		return -EFAULT;

	return drm_ioctl(file,
			 DRM_IOCTL_I915_IRQ_EMIT, (unsigned long) request);
}
typedef struct drm_i915_getparam32 {

			  &request->value))
		return -EFAULT;

	return drm_ioctl(file,
			 DRM_IOCTL_I915_GETPARAM, (unsigned long) request);
}


			  &request->region_offset))
		return -EFAULT;

	return drm_ioctl(file,
			 DRM_IOCTL_I915_ALLOC, (unsigned long) request);
}


	if (fn != NULL)
		ret = (*fn)(filp, cmd, arg);
	else
		ret = drm_ioctl(filp, cmd, arg);
	unlock_kernel();

	return ret;

Lines 985-991 Link Here

(-)psb-kernel-source-4.41.1/psb_drv.c.old (-1 / +1 lines)
985	.owner = THIS_MODULE,	985	.owner = THIS_MODULE,
986	.open = drm_open,	986	.open = drm_open,
987	.release = psb_release,	987	.release = psb_release,
988	.ioctl = drm_ioctl,	988	.unlocked_ioctl = drm_ioctl,
989	.mmap = drm_mmap,	989	.mmap = drm_mmap,
990	.poll = psb_poll,	990	.poll = psb_poll,
991	.fasync = drm_fasync,	991	.fasync = drm_fasync,

Return to bug 344889

Lines 66-72 Link Here

(-)psb-kernel-source-4.41.1/i915_ioc32.c.old (-6 / +6 lines)
66	&batchbuffer->cliprects))	66	&batchbuffer->cliprects))
67	return -EFAULT;	67	return -EFAULT;
68		68
69	return drm_ioctl(file->f_dentry->d_inode, file,	69	return drm_ioctl(file,
70	DRM_IOCTL_I915_BATCHBUFFER,	70	DRM_IOCTL_I915_BATCHBUFFER,
71	(unsigned long) batchbuffer);	71	(unsigned long) batchbuffer);
72	}	72	}
Lines 102-108 Link Here
102	&cmdbuffer->cliprects))	102	&cmdbuffer->cliprects))
103	return -EFAULT;	103	return -EFAULT;
104		104
105	return drm_ioctl(file->f_dentry->d_inode, file,	105	return drm_ioctl(file,
106	DRM_IOCTL_I915_CMDBUFFER, (unsigned long) cmdbuffer);	106	DRM_IOCTL_I915_CMDBUFFER, (unsigned long) cmdbuffer);
107	}	107	}
108		108
Lines 125-131 Link Here
125	&request->irq_seq))	125	&request->irq_seq))
126	return -EFAULT;	126	return -EFAULT;
127		127
128	return drm_ioctl(file->f_dentry->d_inode, file,	128	return drm_ioctl(file,
129	DRM_IOCTL_I915_IRQ_EMIT, (unsigned long) request);	129	DRM_IOCTL_I915_IRQ_EMIT, (unsigned long) request);
130	}	130	}
131	typedef struct drm_i915_getparam32 {	131	typedef struct drm_i915_getparam32 {
Lines 149-155 Link Here
149	&request->value))	149	&request->value))
150	return -EFAULT;	150	return -EFAULT;
151		151
152	return drm_ioctl(file->f_dentry->d_inode, file,	152	return drm_ioctl(file,
153	DRM_IOCTL_I915_GETPARAM, (unsigned long) request);	153	DRM_IOCTL_I915_GETPARAM, (unsigned long) request);
154	}	154	}
155		155
Lines 178-184 Link Here
178	&request->region_offset))	178	&request->region_offset))
179	return -EFAULT;	179	return -EFAULT;
180		180
181	return drm_ioctl(file->f_dentry->d_inode, file,	181	return drm_ioctl(file,
182	DRM_IOCTL_I915_ALLOC, (unsigned long) request);	182	DRM_IOCTL_I915_ALLOC, (unsigned long) request);
183	}	183	}
184		184
Lines 216-222 Link Here
216	if (fn != NULL)	216	if (fn != NULL)
217	ret = (*fn)(filp, cmd, arg);	217	ret = (*fn)(filp, cmd, arg);
218	else	218	else
219	ret = drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg);	219	ret = drm_ioctl(filp, cmd, arg);
220	unlock_kernel();	220	unlock_kernel();
221		221
222	return ret;	222	return ret;