diff options
| author | Eric Anholt <eric@anholt.net> | 2007-09-03 02:06:45 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@optimus.(none)> | 2007-10-15 00:38:20 (GMT) |
| commit | c153f45f9b7e30289157bba3ff5682291df16caa (patch) | |
| tree | 33f21e1ebd83ec548751f3d490afe6230ab99972 /drivers/char/drm/i830_drv.h | |
| parent | b589ee5943a9610ebaea6e4e3433f2ae4d812b0b (diff) | |
| download | linux-fsl-qoriq-c153f45f9b7e30289157bba3ff5682291df16caa.tar.xz | |
drm: Replace DRM_IOCTL_ARGS with (dev, data, file_priv) and remove DRM_DEVICE.
The data is now in kernel space, copied in/out as appropriate according to t
This results in DRM_COPY_{TO,FROM}_USER going away, and error paths to deal
with those failures. This also means that XFree86 4.2.0 support for i810 DR
is lost.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/i830_drv.h')
| -rw-r--r-- | drivers/char/drm/i830_drv.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/drm/i830_drv.h b/drivers/char/drm/i830_drv.h index 615bf9f..db3a9fa 100644 --- a/drivers/char/drm/i830_drv.h +++ b/drivers/char/drm/i830_drv.h @@ -122,14 +122,14 @@ typedef struct drm_i830_private { } drm_i830_private_t; -extern drm_ioctl_desc_t i830_ioctls[]; +extern struct drm_ioctl_desc i830_ioctls[]; extern int i830_max_ioctl; /* i830_irq.c */ -extern int i830_irq_emit(struct inode *inode, struct drm_file *file_priv, - unsigned int cmd, unsigned long arg); -extern int i830_irq_wait(struct inode *inode, struct drm_file *file_priv, - unsigned int cmd, unsigned long arg); +extern int i830_irq_emit(struct drm_device *dev, void *data, + struct drm_file *file_priv); +extern int i830_irq_wait(struct drm_device *dev, void *data, + struct drm_file *file_priv); extern irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS); extern void i830_driver_irq_preinstall(struct drm_device * dev); |