diff options
Diffstat (limited to 'drivers/char/drm/r128_cce.c')
-rw-r--r-- | drivers/char/drm/r128_cce.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/drm/r128_cce.c b/drivers/char/drm/r128_cce.c index d1e762e4eb54..70ba703992ef 100644 --- a/drivers/char/drm/r128_cce.c +++ b/drivers/char/drm/r128_cce.c | |||
@@ -773,7 +773,7 @@ static int r128_freelist_init(struct drm_device * dev) | |||
773 | { | 773 | { |
774 | drm_device_dma_t *dma = dev->dma; | 774 | drm_device_dma_t *dma = dev->dma; |
775 | drm_r128_private_t *dev_priv = dev->dev_private; | 775 | drm_r128_private_t *dev_priv = dev->dev_private; |
776 | drm_buf_t *buf; | 776 | struct drm_buf *buf; |
777 | drm_r128_buf_priv_t *buf_priv; | 777 | drm_r128_buf_priv_t *buf_priv; |
778 | drm_r128_freelist_t *entry; | 778 | drm_r128_freelist_t *entry; |
779 | int i; | 779 | int i; |
@@ -815,12 +815,12 @@ static int r128_freelist_init(struct drm_device * dev) | |||
815 | } | 815 | } |
816 | #endif | 816 | #endif |
817 | 817 | ||
818 | static drm_buf_t *r128_freelist_get(struct drm_device * dev) | 818 | static struct drm_buf *r128_freelist_get(struct drm_device * dev) |
819 | { | 819 | { |
820 | drm_device_dma_t *dma = dev->dma; | 820 | drm_device_dma_t *dma = dev->dma; |
821 | drm_r128_private_t *dev_priv = dev->dev_private; | 821 | drm_r128_private_t *dev_priv = dev->dev_private; |
822 | drm_r128_buf_priv_t *buf_priv; | 822 | drm_r128_buf_priv_t *buf_priv; |
823 | drm_buf_t *buf; | 823 | struct drm_buf *buf; |
824 | int i, t; | 824 | int i, t; |
825 | 825 | ||
826 | /* FIXME: Optimize -- use freelist code */ | 826 | /* FIXME: Optimize -- use freelist code */ |
@@ -859,7 +859,7 @@ void r128_freelist_reset(struct drm_device * dev) | |||
859 | int i; | 859 | int i; |
860 | 860 | ||
861 | for (i = 0; i < dma->buf_count; i++) { | 861 | for (i = 0; i < dma->buf_count; i++) { |
862 | drm_buf_t *buf = dma->buflist[i]; | 862 | struct drm_buf *buf = dma->buflist[i]; |
863 | drm_r128_buf_priv_t *buf_priv = buf->dev_private; | 863 | drm_r128_buf_priv_t *buf_priv = buf->dev_private; |
864 | buf_priv->age = 0; | 864 | buf_priv->age = 0; |
865 | } | 865 | } |
@@ -889,7 +889,7 @@ int r128_wait_ring(drm_r128_private_t * dev_priv, int n) | |||
889 | static int r128_cce_get_buffers(DRMFILE filp, struct drm_device * dev, struct drm_dma * d) | 889 | static int r128_cce_get_buffers(DRMFILE filp, struct drm_device * dev, struct drm_dma * d) |
890 | { | 890 | { |
891 | int i; | 891 | int i; |
892 | drm_buf_t *buf; | 892 | struct drm_buf *buf; |
893 | 893 | ||
894 | for (i = d->granted_count; i < d->request_count; i++) { | 894 | for (i = d->granted_count; i < d->request_count; i++) { |
895 | buf = r128_freelist_get(dev); | 895 | buf = r128_freelist_get(dev); |