diff options
Diffstat (limited to 'drivers/char/drm/radeon_cp.c')
-rw-r--r-- | drivers/char/drm/radeon_cp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c index d75a0ee5f47c..9e80af7aeeac 100644 --- a/drivers/char/drm/radeon_cp.c +++ b/drivers/char/drm/radeon_cp.c | |||
@@ -2046,12 +2046,12 @@ int radeon_fullscreen(DRM_IOCTL_ARGS) | |||
2046 | * they can't get the lock. | 2046 | * they can't get the lock. |
2047 | */ | 2047 | */ |
2048 | 2048 | ||
2049 | drm_buf_t *radeon_freelist_get(struct drm_device * dev) | 2049 | struct drm_buf *radeon_freelist_get(struct drm_device * dev) |
2050 | { | 2050 | { |
2051 | drm_device_dma_t *dma = dev->dma; | 2051 | drm_device_dma_t *dma = dev->dma; |
2052 | drm_radeon_private_t *dev_priv = dev->dev_private; | 2052 | drm_radeon_private_t *dev_priv = dev->dev_private; |
2053 | drm_radeon_buf_priv_t *buf_priv; | 2053 | drm_radeon_buf_priv_t *buf_priv; |
2054 | drm_buf_t *buf; | 2054 | struct drm_buf *buf; |
2055 | int i, t; | 2055 | int i, t; |
2056 | int start; | 2056 | int start; |
2057 | 2057 | ||
@@ -2086,12 +2086,12 @@ drm_buf_t *radeon_freelist_get(struct drm_device * dev) | |||
2086 | } | 2086 | } |
2087 | 2087 | ||
2088 | #if 0 | 2088 | #if 0 |
2089 | drm_buf_t *radeon_freelist_get(struct drm_device * dev) | 2089 | struct drm_buf *radeon_freelist_get(struct drm_device * dev) |
2090 | { | 2090 | { |
2091 | drm_device_dma_t *dma = dev->dma; | 2091 | drm_device_dma_t *dma = dev->dma; |
2092 | drm_radeon_private_t *dev_priv = dev->dev_private; | 2092 | drm_radeon_private_t *dev_priv = dev->dev_private; |
2093 | drm_radeon_buf_priv_t *buf_priv; | 2093 | drm_radeon_buf_priv_t *buf_priv; |
2094 | drm_buf_t *buf; | 2094 | struct drm_buf *buf; |
2095 | int i, t; | 2095 | int i, t; |
2096 | int start; | 2096 | int start; |
2097 | u32 done_age = DRM_READ32(dev_priv->ring_rptr, RADEON_SCRATCHOFF(1)); | 2097 | u32 done_age = DRM_READ32(dev_priv->ring_rptr, RADEON_SCRATCHOFF(1)); |
@@ -2128,7 +2128,7 @@ void radeon_freelist_reset(struct drm_device * dev) | |||
2128 | 2128 | ||
2129 | dev_priv->last_buf = 0; | 2129 | dev_priv->last_buf = 0; |
2130 | for (i = 0; i < dma->buf_count; i++) { | 2130 | for (i = 0; i < dma->buf_count; i++) { |
2131 | drm_buf_t *buf = dma->buflist[i]; | 2131 | struct drm_buf *buf = dma->buflist[i]; |
2132 | drm_radeon_buf_priv_t *buf_priv = buf->dev_private; | 2132 | drm_radeon_buf_priv_t *buf_priv = buf->dev_private; |
2133 | buf_priv->age = 0; | 2133 | buf_priv->age = 0; |
2134 | } | 2134 | } |
@@ -2174,7 +2174,7 @@ static int radeon_cp_get_buffers(DRMFILE filp, struct drm_device * dev, | |||
2174 | struct drm_dma * d) | 2174 | struct drm_dma * d) |
2175 | { | 2175 | { |
2176 | int i; | 2176 | int i; |
2177 | drm_buf_t *buf; | 2177 | struct drm_buf *buf; |
2178 | 2178 | ||
2179 | for (i = d->granted_count; i < d->request_count; i++) { | 2179 | for (i = d->granted_count; i < d->request_count; i++) { |
2180 | buf = radeon_freelist_get(dev); | 2180 | buf = radeon_freelist_get(dev); |