diff options
| author | Eric Anholt <eric@anholt.net> | 2007-07-19 17:11:11 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-07-20 18:16:42 -0700 |
| commit | 5b38e134163cc375e91424c4688cc9328c6e9082 (patch) | |
| tree | 3930e659e99aa4c5c319aaca8cffa041e9087e62 /bsd-core/drm_dma.c | |
| parent | c1119b1b092527fbb6950d0b5e51e076ddb00f29 (diff) | |
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 the
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 DRM
is lost.
Diffstat (limited to 'bsd-core/drm_dma.c')
| -rw-r--r-- | bsd-core/drm_dma.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bsd-core/drm_dma.c b/bsd-core/drm_dma.c index fc219039..fc1e1250 100644 --- a/bsd-core/drm_dma.c +++ b/bsd-core/drm_dma.c @@ -117,13 +117,11 @@ void drm_reclaim_buffers(drm_device_t *dev, struct drm_file *file_priv) } /* Call into the driver-specific DMA handler */ -int drm_dma(DRM_IOCTL_ARGS) +int drm_dma(drm_device_t *dev, void *data, struct drm_file *file_priv) { - DRM_DEVICE; if (dev->driver.dma_ioctl) { - return -dev->driver.dma_ioctl(kdev, cmd, data, flags, p, - file_priv); + return -dev->driver.dma_ioctl(dev, data, file_priv); } else { DRM_DEBUG("DMA ioctl on driver with no dma handler\n"); return EINVAL; |