diff options
Diffstat (limited to 'drivers/char/drm/r128_state.c')
-rw-r--r-- | drivers/char/drm/r128_state.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/char/drm/r128_state.c b/drivers/char/drm/r128_state.c index 21d445e8e418..1fdfeb876a8e 100644 --- a/drivers/char/drm/r128_state.c +++ b/drivers/char/drm/r128_state.c | |||
@@ -567,7 +567,7 @@ static void r128_cce_dispatch_flip(struct drm_device * dev) | |||
567 | ADVANCE_RING(); | 567 | ADVANCE_RING(); |
568 | } | 568 | } |
569 | 569 | ||
570 | static void r128_cce_dispatch_vertex(struct drm_device * dev, drm_buf_t * buf) | 570 | static void r128_cce_dispatch_vertex(struct drm_device * dev, struct drm_buf * buf) |
571 | { | 571 | { |
572 | drm_r128_private_t *dev_priv = dev->dev_private; | 572 | drm_r128_private_t *dev_priv = dev->dev_private; |
573 | drm_r128_buf_priv_t *buf_priv = buf->dev_private; | 573 | drm_r128_buf_priv_t *buf_priv = buf->dev_private; |
@@ -638,7 +638,7 @@ static void r128_cce_dispatch_vertex(struct drm_device * dev, drm_buf_t * buf) | |||
638 | } | 638 | } |
639 | 639 | ||
640 | static void r128_cce_dispatch_indirect(struct drm_device * dev, | 640 | static void r128_cce_dispatch_indirect(struct drm_device * dev, |
641 | drm_buf_t * buf, int start, int end) | 641 | struct drm_buf * buf, int start, int end) |
642 | { | 642 | { |
643 | drm_r128_private_t *dev_priv = dev->dev_private; | 643 | drm_r128_private_t *dev_priv = dev->dev_private; |
644 | drm_r128_buf_priv_t *buf_priv = buf->dev_private; | 644 | drm_r128_buf_priv_t *buf_priv = buf->dev_private; |
@@ -693,7 +693,7 @@ static void r128_cce_dispatch_indirect(struct drm_device * dev, | |||
693 | } | 693 | } |
694 | 694 | ||
695 | static void r128_cce_dispatch_indices(struct drm_device * dev, | 695 | static void r128_cce_dispatch_indices(struct drm_device * dev, |
696 | drm_buf_t * buf, | 696 | struct drm_buf * buf, |
697 | int start, int end, int count) | 697 | int start, int end, int count) |
698 | { | 698 | { |
699 | drm_r128_private_t *dev_priv = dev->dev_private; | 699 | drm_r128_private_t *dev_priv = dev->dev_private; |
@@ -781,7 +781,7 @@ static int r128_cce_dispatch_blit(DRMFILE filp, | |||
781 | { | 781 | { |
782 | drm_r128_private_t *dev_priv = dev->dev_private; | 782 | drm_r128_private_t *dev_priv = dev->dev_private; |
783 | drm_device_dma_t *dma = dev->dma; | 783 | drm_device_dma_t *dma = dev->dma; |
784 | drm_buf_t *buf; | 784 | struct drm_buf *buf; |
785 | drm_r128_buf_priv_t *buf_priv; | 785 | drm_r128_buf_priv_t *buf_priv; |
786 | u32 *data; | 786 | u32 *data; |
787 | int dword_shift, dwords; | 787 | int dword_shift, dwords; |
@@ -1355,7 +1355,7 @@ static int r128_cce_vertex(DRM_IOCTL_ARGS) | |||
1355 | DRM_DEVICE; | 1355 | DRM_DEVICE; |
1356 | drm_r128_private_t *dev_priv = dev->dev_private; | 1356 | drm_r128_private_t *dev_priv = dev->dev_private; |
1357 | drm_device_dma_t *dma = dev->dma; | 1357 | drm_device_dma_t *dma = dev->dma; |
1358 | drm_buf_t *buf; | 1358 | struct drm_buf *buf; |
1359 | drm_r128_buf_priv_t *buf_priv; | 1359 | drm_r128_buf_priv_t *buf_priv; |
1360 | drm_r128_vertex_t vertex; | 1360 | drm_r128_vertex_t vertex; |
1361 | 1361 | ||
@@ -1414,7 +1414,7 @@ static int r128_cce_indices(DRM_IOCTL_ARGS) | |||
1414 | DRM_DEVICE; | 1414 | DRM_DEVICE; |
1415 | drm_r128_private_t *dev_priv = dev->dev_private; | 1415 | drm_r128_private_t *dev_priv = dev->dev_private; |
1416 | drm_device_dma_t *dma = dev->dma; | 1416 | drm_device_dma_t *dma = dev->dma; |
1417 | drm_buf_t *buf; | 1417 | struct drm_buf *buf; |
1418 | drm_r128_buf_priv_t *buf_priv; | 1418 | drm_r128_buf_priv_t *buf_priv; |
1419 | drm_r128_indices_t elts; | 1419 | drm_r128_indices_t elts; |
1420 | int count; | 1420 | int count; |
@@ -1572,7 +1572,7 @@ static int r128_cce_indirect(DRM_IOCTL_ARGS) | |||
1572 | DRM_DEVICE; | 1572 | DRM_DEVICE; |
1573 | drm_r128_private_t *dev_priv = dev->dev_private; | 1573 | drm_r128_private_t *dev_priv = dev->dev_private; |
1574 | drm_device_dma_t *dma = dev->dma; | 1574 | drm_device_dma_t *dma = dev->dma; |
1575 | drm_buf_t *buf; | 1575 | struct drm_buf *buf; |
1576 | drm_r128_buf_priv_t *buf_priv; | 1576 | drm_r128_buf_priv_t *buf_priv; |
1577 | drm_r128_indirect_t indirect; | 1577 | drm_r128_indirect_t indirect; |
1578 | #if 0 | 1578 | #if 0 |