summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2005-11-11 12:23:18 +0000
committerDave Airlie <airlied@linux.ie>2005-11-11 12:23:18 +0000
commitb5d71f63cdced53a8b492c3269e966088b8a3b45 (patch)
tree47c4be4e55ccc0660666c33e29636a315f3efea5
parent224ebd2c8d5916bdc782a60542ac04b86320a624 (diff)
enable i915 32/64 bit ioctls
-rw-r--r--linux-core/i915_drv.c3
-rw-r--r--shared-core/i915_drv.h2
2 files changed, 5 insertions, 0 deletions
diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index e8cd8c03..5efa4420 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -66,6 +66,9 @@ static struct drm_driver driver = {
.mmap = drm_mmap,
.poll = drm_poll,
.fasync = drm_fasync,
+#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
+ .compat_ioctl = i915_compat_ioctl,
+#endif
},
.pci_driver = {
.name = DRIVER_NAME,
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index 600deabc..7bd13219 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -105,6 +105,8 @@ extern int i915_driver_load(struct drm_device *, unsigned long flags);
extern void i915_driver_lastclose(drm_device_t * dev);
extern void i915_driver_preclose(drm_device_t * dev, DRMFILE filp);
extern int i915_driver_device_is_agp(drm_device_t * dev);
+extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,
+ unsigned long arg);
/* i915_irq.c */
extern int i915_irq_emit(DRM_IOCTL_ARGS);