diff options
Diffstat (limited to 'drivers/char/drm/i830_dma.c')
-rw-r--r-- | drivers/char/drm/i830_dma.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/drm/i830_dma.c b/drivers/char/drm/i830_dma.c index 021a0711485a..72c781a7de9a 100644 --- a/drivers/char/drm/i830_dma.c +++ b/drivers/char/drm/i830_dma.c | |||
@@ -49,7 +49,7 @@ | |||
49 | 49 | ||
50 | static struct drm_buf *i830_freelist_get(struct drm_device * dev) | 50 | static struct drm_buf *i830_freelist_get(struct drm_device * dev) |
51 | { | 51 | { |
52 | drm_device_dma_t *dma = dev->dma; | 52 | struct drm_device_dma *dma = dev->dma; |
53 | int i; | 53 | int i; |
54 | int used; | 54 | int used; |
55 | 55 | ||
@@ -208,7 +208,7 @@ static int i830_dma_get_buffer(struct drm_device * dev, drm_i830_dma_t * d, | |||
208 | 208 | ||
209 | static int i830_dma_cleanup(struct drm_device * dev) | 209 | static int i830_dma_cleanup(struct drm_device * dev) |
210 | { | 210 | { |
211 | drm_device_dma_t *dma = dev->dma; | 211 | struct drm_device_dma *dma = dev->dma; |
212 | 212 | ||
213 | /* Make sure interrupts are disabled here because the uninstall ioctl | 213 | /* Make sure interrupts are disabled here because the uninstall ioctl |
214 | * may not have been called from userspace and after dev_private | 214 | * may not have been called from userspace and after dev_private |
@@ -298,7 +298,7 @@ static void i830_kernel_lost_context(struct drm_device * dev) | |||
298 | 298 | ||
299 | static int i830_freelist_init(struct drm_device * dev, drm_i830_private_t * dev_priv) | 299 | static int i830_freelist_init(struct drm_device * dev, drm_i830_private_t * dev_priv) |
300 | { | 300 | { |
301 | drm_device_dma_t *dma = dev->dma; | 301 | struct drm_device_dma *dma = dev->dma; |
302 | int my_idx = 36; | 302 | int my_idx = 36; |
303 | u32 *hw_status = (u32 *) (dev_priv->hw_status_page + my_idx); | 303 | u32 *hw_status = (u32 *) (dev_priv->hw_status_page + my_idx); |
304 | int i; | 304 | int i; |
@@ -1218,7 +1218,7 @@ static void i830_dma_quiescent(struct drm_device * dev) | |||
1218 | static int i830_flush_queue(struct drm_device * dev) | 1218 | static int i830_flush_queue(struct drm_device * dev) |
1219 | { | 1219 | { |
1220 | drm_i830_private_t *dev_priv = dev->dev_private; | 1220 | drm_i830_private_t *dev_priv = dev->dev_private; |
1221 | drm_device_dma_t *dma = dev->dma; | 1221 | struct drm_device_dma *dma = dev->dma; |
1222 | int i, ret = 0; | 1222 | int i, ret = 0; |
1223 | RING_LOCALS; | 1223 | RING_LOCALS; |
1224 | 1224 | ||
@@ -1250,7 +1250,7 @@ static int i830_flush_queue(struct drm_device * dev) | |||
1250 | /* Must be called with the lock held */ | 1250 | /* Must be called with the lock held */ |
1251 | static void i830_reclaim_buffers(struct drm_device * dev, struct file *filp) | 1251 | static void i830_reclaim_buffers(struct drm_device * dev, struct file *filp) |
1252 | { | 1252 | { |
1253 | drm_device_dma_t *dma = dev->dma; | 1253 | struct drm_device_dma *dma = dev->dma; |
1254 | int i; | 1254 | int i; |
1255 | 1255 | ||
1256 | if (!dma) | 1256 | if (!dma) |
@@ -1295,7 +1295,7 @@ static int i830_dma_vertex(struct inode *inode, struct file *filp, | |||
1295 | { | 1295 | { |
1296 | struct drm_file *priv = filp->private_data; | 1296 | struct drm_file *priv = filp->private_data; |
1297 | struct drm_device *dev = priv->head->dev; | 1297 | struct drm_device *dev = priv->head->dev; |
1298 | drm_device_dma_t *dma = dev->dma; | 1298 | struct drm_device_dma *dma = dev->dma; |
1299 | drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private; | 1299 | drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private; |
1300 | u32 *hw_status = dev_priv->hw_status_page; | 1300 | u32 *hw_status = dev_priv->hw_status_page; |
1301 | drm_i830_sarea_t *sarea_priv = (drm_i830_sarea_t *) | 1301 | drm_i830_sarea_t *sarea_priv = (drm_i830_sarea_t *) |