diff options
| author | Eric Anholt <eric@anholt.net> | 2007-09-02 22:06:45 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@optimus.(none)> | 2007-10-14 20:38:20 -0400 |
| commit | c153f45f9b7e30289157bba3ff5682291df16caa (patch) | |
| tree | 33f21e1ebd83ec548751f3d490afe6230ab99972 /drivers/char/drm/via_drv.h | |
| parent | b589ee5943a9610ebaea6e4e3433f2ae4d812b0b (diff) | |
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/via_drv.h')
| -rw-r--r-- | drivers/char/drm/via_drv.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/char/drm/via_drv.h b/drivers/char/drm/via_drv.h index 854b393e0256..2daae81874cd 100644 --- a/drivers/char/drm/via_drv.h +++ b/drivers/char/drm/via_drv.h | |||
| @@ -110,18 +110,18 @@ enum via_family { | |||
| 110 | #define VIA_READ8(reg) DRM_READ8(VIA_BASE, reg) | 110 | #define VIA_READ8(reg) DRM_READ8(VIA_BASE, reg) |
| 111 | #define VIA_WRITE8(reg,val) DRM_WRITE8(VIA_BASE, reg, val) | 111 | #define VIA_WRITE8(reg,val) DRM_WRITE8(VIA_BASE, reg, val) |
| 112 | 112 | ||
| 113 | extern drm_ioctl_desc_t via_ioctls[]; | 113 | extern struct drm_ioctl_desc via_ioctls[]; |
| 114 | extern int via_max_ioctl; | 114 | extern int via_max_ioctl; |
| 115 | 115 | ||
| 116 | extern int via_fb_init(DRM_IOCTL_ARGS); | 116 | extern int via_fb_init(struct drm_device *dev, void *data, struct drm_file *file_priv); |
| 117 | extern int via_mem_alloc(DRM_IOCTL_ARGS); | 117 | extern int via_mem_alloc(struct drm_device *dev, void *data, struct drm_file *file_priv); |
| 118 | extern int via_mem_free(DRM_IOCTL_ARGS); | 118 | extern int via_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv); |
| 119 | extern int via_agp_init(DRM_IOCTL_ARGS); | 119 | extern int via_agp_init(struct drm_device *dev, void *data, struct drm_file *file_priv); |
| 120 | extern int via_map_init(DRM_IOCTL_ARGS); | 120 | extern int via_map_init(struct drm_device *dev, void *data, struct drm_file *file_priv); |
| 121 | extern int via_decoder_futex(DRM_IOCTL_ARGS); | 121 | extern int via_decoder_futex(struct drm_device *dev, void *data, struct drm_file *file_priv); |
| 122 | extern int via_wait_irq(DRM_IOCTL_ARGS); | 122 | extern int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv); |
| 123 | extern int via_dma_blit_sync( DRM_IOCTL_ARGS ); | 123 | extern int via_dma_blit_sync( struct drm_device *dev, void *data, struct drm_file *file_priv ); |
| 124 | extern int via_dma_blit( DRM_IOCTL_ARGS ); | 124 | extern int via_dma_blit( struct drm_device *dev, void *data, struct drm_file *file_priv ); |
| 125 | 125 | ||
| 126 | extern int via_driver_load(struct drm_device *dev, unsigned long chipset); | 126 | extern int via_driver_load(struct drm_device *dev, unsigned long chipset); |
| 127 | extern int via_driver_unload(struct drm_device *dev); | 127 | extern int via_driver_unload(struct drm_device *dev); |