diff options
author | Dave Airlie <airlied@linux.ie> | 2007-07-11 02:32:08 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2007-07-11 02:32:08 -0400 |
commit | cdd55a294c13f8bf05b2f4fee4c96934d5ebd2e4 (patch) | |
tree | b759df2c65f321d2bdd8ff338048a6f67417ca95 /drivers/char/drm/i810_dma.c | |
parent | 8fc2fdf4c9437576f38e97c2f5b700ec77038984 (diff) |
drm: detypef waitlist/freelist/buf_entry/device_dma/drm_queue structs
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/i810_dma.c')
-rw-r--r-- | drivers/char/drm/i810_dma.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c index b4a98fa2e2d4..4d23bd0f8711 100644 --- a/drivers/char/drm/i810_dma.c +++ b/drivers/char/drm/i810_dma.c | |||
@@ -47,7 +47,7 @@ | |||
47 | 47 | ||
48 | static struct drm_buf *i810_freelist_get(struct drm_device * dev) | 48 | static struct drm_buf *i810_freelist_get(struct drm_device * dev) |
49 | { | 49 | { |
50 | drm_device_dma_t *dma = dev->dma; | 50 | struct drm_device_dma *dma = dev->dma; |
51 | int i; | 51 | int i; |
52 | int used; | 52 | int used; |
53 | 53 | ||
@@ -204,7 +204,7 @@ static int i810_dma_get_buffer(struct drm_device * dev, drm_i810_dma_t * d, | |||
204 | 204 | ||
205 | static int i810_dma_cleanup(struct drm_device * dev) | 205 | static int i810_dma_cleanup(struct drm_device * dev) |
206 | { | 206 | { |
207 | drm_device_dma_t *dma = dev->dma; | 207 | struct drm_device_dma *dma = dev->dma; |
208 | 208 | ||
209 | /* Make sure interrupts are disabled here because the uninstall ioctl | 209 | /* Make sure interrupts are disabled here because the uninstall ioctl |
210 | * may not have been called from userspace and after dev_private | 210 | * may not have been called from userspace and after dev_private |
@@ -290,7 +290,7 @@ static void i810_kernel_lost_context(struct drm_device * dev) | |||
290 | 290 | ||
291 | static int i810_freelist_init(struct drm_device * dev, drm_i810_private_t * dev_priv) | 291 | static int i810_freelist_init(struct drm_device * dev, drm_i810_private_t * dev_priv) |
292 | { | 292 | { |
293 | drm_device_dma_t *dma = dev->dma; | 293 | struct drm_device_dma *dma = dev->dma; |
294 | int my_idx = 24; | 294 | int my_idx = 24; |
295 | u32 *hw_status = (u32 *) (dev_priv->hw_status_page + my_idx); | 295 | u32 *hw_status = (u32 *) (dev_priv->hw_status_page + my_idx); |
296 | int i; | 296 | int i; |
@@ -936,7 +936,7 @@ static void i810_dma_quiescent(struct drm_device * dev) | |||
936 | static int i810_flush_queue(struct drm_device * dev) | 936 | static int i810_flush_queue(struct drm_device * dev) |
937 | { | 937 | { |
938 | drm_i810_private_t *dev_priv = dev->dev_private; | 938 | drm_i810_private_t *dev_priv = dev->dev_private; |
939 | drm_device_dma_t *dma = dev->dma; | 939 | struct drm_device_dma *dma = dev->dma; |
940 | int i, ret = 0; | 940 | int i, ret = 0; |
941 | RING_LOCALS; | 941 | RING_LOCALS; |
942 | 942 | ||
@@ -970,7 +970,7 @@ static int i810_flush_queue(struct drm_device * dev) | |||
970 | /* Must be called with the lock held */ | 970 | /* Must be called with the lock held */ |
971 | static void i810_reclaim_buffers(struct drm_device * dev, struct file *filp) | 971 | static void i810_reclaim_buffers(struct drm_device * dev, struct file *filp) |
972 | { | 972 | { |
973 | drm_device_dma_t *dma = dev->dma; | 973 | struct drm_device_dma *dma = dev->dma; |
974 | int i; | 974 | int i; |
975 | 975 | ||
976 | if (!dma) | 976 | if (!dma) |
@@ -1015,7 +1015,7 @@ static int i810_dma_vertex(struct inode *inode, struct file *filp, | |||
1015 | { | 1015 | { |
1016 | struct drm_file *priv = filp->private_data; | 1016 | struct drm_file *priv = filp->private_data; |
1017 | struct drm_device *dev = priv->head->dev; | 1017 | struct drm_device *dev = priv->head->dev; |
1018 | drm_device_dma_t *dma = dev->dma; | 1018 | struct drm_device_dma *dma = dev->dma; |
1019 | drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private; | 1019 | drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private; |
1020 | u32 *hw_status = dev_priv->hw_status_page; | 1020 | u32 *hw_status = dev_priv->hw_status_page; |
1021 | drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *) | 1021 | drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *) |
@@ -1207,7 +1207,7 @@ static int i810_dma_mc(struct inode *inode, struct file *filp, | |||
1207 | { | 1207 | { |
1208 | struct drm_file *priv = filp->private_data; | 1208 | struct drm_file *priv = filp->private_data; |
1209 | struct drm_device *dev = priv->head->dev; | 1209 | struct drm_device *dev = priv->head->dev; |
1210 | drm_device_dma_t *dma = dev->dma; | 1210 | struct drm_device_dma *dma = dev->dma; |
1211 | drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private; | 1211 | drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private; |
1212 | u32 *hw_status = dev_priv->hw_status_page; | 1212 | u32 *hw_status = dev_priv->hw_status_page; |
1213 | drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *) | 1213 | drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *) |