aboutsummaryrefslogtreecommitdiff
path: root/linux-core/xgi_misc.c
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2007-07-27 15:45:59 -0700
committerIan Romanick <idr@us.ibm.com>2007-07-27 15:45:59 -0700
commitcd51f131389297f923798daef6c734ba93f4422b (patch)
treecb453e5f4773a6ccfa20e20adddd3c3eb2b9a38f /linux-core/xgi_misc.c
parentc37ed9eca57a42b98cc67ca98dbf5135f5ab7aba (diff)
Convert to new ioctl interface between core DRM and device-specific module.
Diffstat (limited to 'linux-core/xgi_misc.c')
-rw-r--r--linux-core/xgi_misc.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/linux-core/xgi_misc.c b/linux-core/xgi_misc.c
index 5e8c3da8..6c029782 100644
--- a/linux-core/xgi_misc.c
+++ b/linux-core/xgi_misc.c
@@ -27,9 +27,9 @@
#include "xgi_drv.h"
#include "xgi_regs.h"
-int xgi_ge_reset_ioctl(DRM_IOCTL_ARGS)
+int xgi_ge_reset_ioctl(struct drm_device * dev, void * data,
+ struct drm_file * filp)
{
- DRM_DEVICE;
struct xgi_info *info = dev->dev_private;
xgi_disable_ge(info);
@@ -436,25 +436,23 @@ void xgi_dump_register(struct xgi_info * info)
}
-int xgi_dump_register_ioctl(DRM_IOCTL_ARGS)
+int xgi_dump_register_ioctl(struct drm_device * dev, void * data,
+ struct drm_file * filp)
{
- DRM_DEVICE;
struct xgi_info *info = dev->dev_private;
xgi_dump_register(info);
-
return 0;
}
-int xgi_restore_registers_ioctl(DRM_IOCTL_ARGS)
+int xgi_restore_registers_ioctl(struct drm_device * dev, void * data,
+ struct drm_file * filp)
{
- DRM_DEVICE;
struct xgi_info *info = dev->dev_private;
OUT3X5B(info->mmio_map, 0x13, 0);
OUT3X5B(info->mmio_map, 0x8b, 2);
-
return 0;
}