diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-05-28 21:01:18 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-05-28 21:01:18 +0100 |
| commit | 3a3f39d144c47ce937d6924d344a9ad3d82a2db5 (patch) | |
| tree | 109faf867b2e5774d54fe9499dbfebd3f26f014f /bsd-core/drm_dma.c | |
| parent | 070755af3fecefb6b09e8ef98738e4926e4148a7 (diff) | |
| parent | 5b86823fa36513f521412a38c240cb18f02dcc9a (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts:
shared-core/i915_dma.c
shared-core/i915_drv.h
Diffstat (limited to 'bsd-core/drm_dma.c')
| -rw-r--r-- | bsd-core/drm_dma.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bsd-core/drm_dma.c b/bsd-core/drm_dma.c index 71ef845b..c2586fa0 100644 --- a/bsd-core/drm_dma.c +++ b/bsd-core/drm_dma.c @@ -38,7 +38,7 @@ #include "drmP.h" -int drm_dma_setup(drm_device_t *dev) +int drm_dma_setup(struct drm_device *dev) { dev->dma = malloc(sizeof(*dev->dma), M_DRM, M_NOWAIT | M_ZERO); @@ -50,7 +50,7 @@ int drm_dma_setup(drm_device_t *dev) return 0; } -void drm_dma_takedown(drm_device_t *dev) +void drm_dma_takedown(struct drm_device *dev) { drm_device_dma_t *dma = dev->dma; int i, j; @@ -89,7 +89,7 @@ void drm_dma_takedown(drm_device_t *dev) } -void drm_free_buffer(drm_device_t *dev, drm_buf_t *buf) +void drm_free_buffer(struct drm_device *dev, drm_buf_t *buf) { if (!buf) return; @@ -98,7 +98,7 @@ void drm_free_buffer(drm_device_t *dev, drm_buf_t *buf) buf->used = 0; } -void drm_reclaim_buffers(drm_device_t *dev, struct drm_file *file_priv) +void drm_reclaim_buffers(struct drm_device *dev, struct drm_file *file_priv) { drm_device_dma_t *dma = dev->dma; int i; @@ -122,7 +122,7 @@ void drm_reclaim_buffers(drm_device_t *dev, struct drm_file *file_priv) } /* Call into the driver-specific DMA handler */ -int drm_dma(drm_device_t *dev, void *data, struct drm_file *file_priv) +int drm_dma(struct drm_device *dev, void *data, struct drm_file *file_priv) { if (dev->driver.dma_ioctl) { |