Attachment 13272 Details for Bug 13732 – a 32 bit ioctl compatibility routine to handle execbuffer

[patch] a 32 bit ioctl compatibility routine to handle execbuffer

execbuffer.patch (text/plain), 2.87 KB, created by haihao on 2007-12-21 00:31:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: haihao

Created: 2007-12-21 00:31:56 UTC

Size: 2.87 KB

patch

obsolete

>diff --git a/linux-core/i915_ioc32.c b/linux-core/i915_ioc32.c
>index 11dee03..6230857 100644
>--- a/linux-core/i915_ioc32.c
>+++ b/linux-core/i915_ioc32.c
>@@ -34,6 +34,7 @@
> #include "drmP.h"
> #include "drm.h"
> #include "i915_drm.h"
>+#include "i915_drv.h"
> 
> typedef struct _drm_i915_batchbuffer32 {
> 	int start;		/* agp offset */
>@@ -182,13 +183,54 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
> 			 DRM_IOCTL_I915_ALLOC, (unsigned long) request);
> }
> 
>+typedef struct drm_i915_execbuffer32 {
>+	uint64_t ops_list;
>+	uint32_t num_buffers;
>+	struct _drm_i915_batchbuffer batch;
>+	drm_context_t context; 
>+	struct drm_fence_arg fence_arg;
>+} drm_i915_execbuffer32_t;
>+
>+static int compat_i915_execbuffer(struct file *file, unsigned int cmd,
>+			     unsigned long arg)
>+{
>+	drm_i915_execbuffer32_t req32;
>+	drm_i915_execbuffer_t __user *request;
>+
>+	if (copy_from_user(&req32, (void __user *) arg, sizeof(req32)))
>+		return -EFAULT;
>+
>+	request = compat_alloc_user_space(sizeof(*request));
>+
>+	if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
>+       || __put_user(req32.ops_list, &request->ops_list)
>+       || __put_user(req32.num_buffers, &request->num_buffers)
>+       || __put_user(req32.context, &request->context)
>+       || __copy_to_user(&request->fence_arg, &req32.fence_arg, sizeof(req32.fence_arg))
>+       || __put_user(req32.batch.start, &request->batch.start)
>+       || __put_user(req32.batch.used, &request->batch.used)
>+       || __put_user(req32.batch.DR1, &request->batch.DR1)
>+       || __put_user(req32.batch.DR4, &request->batch.DR4)
>+       || __put_user(req32.batch.num_cliprects,
>+                     &request->batch.num_cliprects)
>+       || __put_user((int __user *)(unsigned long)req32.batch.cliprects,
>+                          &request->batch.cliprects))
>+		return -EFAULT;
>+
>+	return drm_ioctl(file->f_dentry->d_inode, file,
>+			 DRM_IOCTL_I915_EXECBUFFER, (unsigned long)request);
>+}
>+
> 
> drm_ioctl_compat_t *i915_compat_ioctls[] = {
> 	[DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
> 	[DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
> 	[DRM_I915_GETPARAM] = compat_i915_getparam,
> 	[DRM_I915_IRQ_EMIT] = compat_i915_irq_emit,
>-	[DRM_I915_ALLOC] = compat_i915_alloc
>+	[DRM_I915_ALLOC] = compat_i915_alloc,
>+#ifdef I915_HAVE_BUFFER
>+	[DRM_I915_EXECBUFFER] = compat_i915_execbuffer,
>+#endif
> };
> 
> /**
>diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
>diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h
>index cfa3f93..cc5080b 100644
>--- a/shared-core/i915_drm.h
>+++ b/shared-core/i915_drm.h
>@@ -356,12 +356,12 @@ struct drm_i915_op_arg {
> 
> };
> 
>-struct drm_i915_execbuffer {
>+typedef struct drm_i915_execbuffer {
> 	uint64_t ops_list;
> 	uint32_t num_buffers;
> 	struct _drm_i915_batchbuffer batch;
> 	drm_context_t context; /* for lockless use in the future */
> 	struct drm_fence_arg fence_arg;
>-};
>+} drm_i915_execbuffer_t;
> 
> #endif				/* _I915_DRM_H_ */

Actions: View | Splinter Review

Attachments on bug 13732: 13211 | 13212 | 13272

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.