diff options
Diffstat (limited to 'drivers/char/drm/r128_state.c')
-rw-r--r-- | drivers/char/drm/r128_state.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/char/drm/r128_state.c b/drivers/char/drm/r128_state.c index 17b11e7d8f32..21d445e8e418 100644 --- a/drivers/char/drm/r128_state.c +++ b/drivers/char/drm/r128_state.c | |||
@@ -38,7 +38,7 @@ | |||
38 | */ | 38 | */ |
39 | 39 | ||
40 | static void r128_emit_clip_rects(drm_r128_private_t * dev_priv, | 40 | static void r128_emit_clip_rects(drm_r128_private_t * dev_priv, |
41 | drm_clip_rect_t * boxes, int count) | 41 | struct drm_clip_rect * boxes, int count) |
42 | { | 42 | { |
43 | u32 aux_sc_cntl = 0x00000000; | 43 | u32 aux_sc_cntl = 0x00000000; |
44 | RING_LOCALS; | 44 | RING_LOCALS; |
@@ -352,13 +352,13 @@ static void r128_print_dirty(const char *msg, unsigned int flags) | |||
352 | (flags & R128_REQUIRE_QUIESCENCE) ? "quiescence, " : ""); | 352 | (flags & R128_REQUIRE_QUIESCENCE) ? "quiescence, " : ""); |
353 | } | 353 | } |
354 | 354 | ||
355 | static void r128_cce_dispatch_clear(drm_device_t * dev, | 355 | static void r128_cce_dispatch_clear(struct drm_device * dev, |
356 | drm_r128_clear_t * clear) | 356 | drm_r128_clear_t * clear) |
357 | { | 357 | { |
358 | drm_r128_private_t *dev_priv = dev->dev_private; | 358 | drm_r128_private_t *dev_priv = dev->dev_private; |
359 | drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; | 359 | drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; |
360 | int nbox = sarea_priv->nbox; | 360 | int nbox = sarea_priv->nbox; |
361 | drm_clip_rect_t *pbox = sarea_priv->boxes; | 361 | struct drm_clip_rect *pbox = sarea_priv->boxes; |
362 | unsigned int flags = clear->flags; | 362 | unsigned int flags = clear->flags; |
363 | int i; | 363 | int i; |
364 | RING_LOCALS; | 364 | RING_LOCALS; |
@@ -458,12 +458,12 @@ static void r128_cce_dispatch_clear(drm_device_t * dev, | |||
458 | } | 458 | } |
459 | } | 459 | } |
460 | 460 | ||
461 | static void r128_cce_dispatch_swap(drm_device_t * dev) | 461 | static void r128_cce_dispatch_swap(struct drm_device * dev) |
462 | { | 462 | { |
463 | drm_r128_private_t *dev_priv = dev->dev_private; | 463 | drm_r128_private_t *dev_priv = dev->dev_private; |
464 | drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; | 464 | drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; |
465 | int nbox = sarea_priv->nbox; | 465 | int nbox = sarea_priv->nbox; |
466 | drm_clip_rect_t *pbox = sarea_priv->boxes; | 466 | struct drm_clip_rect *pbox = sarea_priv->boxes; |
467 | int i; | 467 | int i; |
468 | RING_LOCALS; | 468 | RING_LOCALS; |
469 | DRM_DEBUG("%s\n", __FUNCTION__); | 469 | DRM_DEBUG("%s\n", __FUNCTION__); |
@@ -524,7 +524,7 @@ static void r128_cce_dispatch_swap(drm_device_t * dev) | |||
524 | ADVANCE_RING(); | 524 | ADVANCE_RING(); |
525 | } | 525 | } |
526 | 526 | ||
527 | static void r128_cce_dispatch_flip(drm_device_t * dev) | 527 | static void r128_cce_dispatch_flip(struct drm_device * dev) |
528 | { | 528 | { |
529 | drm_r128_private_t *dev_priv = dev->dev_private; | 529 | drm_r128_private_t *dev_priv = dev->dev_private; |
530 | RING_LOCALS; | 530 | RING_LOCALS; |
@@ -567,7 +567,7 @@ static void r128_cce_dispatch_flip(drm_device_t * dev) | |||
567 | ADVANCE_RING(); | 567 | ADVANCE_RING(); |
568 | } | 568 | } |
569 | 569 | ||
570 | static void r128_cce_dispatch_vertex(drm_device_t * dev, drm_buf_t * buf) | 570 | static void r128_cce_dispatch_vertex(struct drm_device * dev, drm_buf_t * 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; |
@@ -637,7 +637,7 @@ static void r128_cce_dispatch_vertex(drm_device_t * dev, drm_buf_t * buf) | |||
637 | sarea_priv->nbox = 0; | 637 | sarea_priv->nbox = 0; |
638 | } | 638 | } |
639 | 639 | ||
640 | static void r128_cce_dispatch_indirect(drm_device_t * dev, | 640 | static void r128_cce_dispatch_indirect(struct drm_device * dev, |
641 | drm_buf_t * buf, int start, int end) | 641 | drm_buf_t * 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; |
@@ -692,7 +692,7 @@ static void r128_cce_dispatch_indirect(drm_device_t * dev, | |||
692 | dev_priv->sarea_priv->last_dispatch++; | 692 | dev_priv->sarea_priv->last_dispatch++; |
693 | } | 693 | } |
694 | 694 | ||
695 | static void r128_cce_dispatch_indices(drm_device_t * dev, | 695 | static void r128_cce_dispatch_indices(struct drm_device * dev, |
696 | drm_buf_t * buf, | 696 | drm_buf_t * buf, |
697 | int start, int end, int count) | 697 | int start, int end, int count) |
698 | { | 698 | { |
@@ -777,7 +777,7 @@ static void r128_cce_dispatch_indices(drm_device_t * dev, | |||
777 | } | 777 | } |
778 | 778 | ||
779 | static int r128_cce_dispatch_blit(DRMFILE filp, | 779 | static int r128_cce_dispatch_blit(DRMFILE filp, |
780 | drm_device_t * dev, drm_r128_blit_t * blit) | 780 | struct drm_device * dev, drm_r128_blit_t * blit) |
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; |
@@ -887,7 +887,7 @@ static int r128_cce_dispatch_blit(DRMFILE filp, | |||
887 | * have hardware stencil support. | 887 | * have hardware stencil support. |
888 | */ | 888 | */ |
889 | 889 | ||
890 | static int r128_cce_dispatch_write_span(drm_device_t * dev, | 890 | static int r128_cce_dispatch_write_span(struct drm_device * dev, |
891 | drm_r128_depth_t * depth) | 891 | drm_r128_depth_t * depth) |
892 | { | 892 | { |
893 | drm_r128_private_t *dev_priv = dev->dev_private; | 893 | drm_r128_private_t *dev_priv = dev->dev_private; |
@@ -983,7 +983,7 @@ static int r128_cce_dispatch_write_span(drm_device_t * dev, | |||
983 | return 0; | 983 | return 0; |
984 | } | 984 | } |
985 | 985 | ||
986 | static int r128_cce_dispatch_write_pixels(drm_device_t * dev, | 986 | static int r128_cce_dispatch_write_pixels(struct drm_device * dev, |
987 | drm_r128_depth_t * depth) | 987 | drm_r128_depth_t * depth) |
988 | { | 988 | { |
989 | drm_r128_private_t *dev_priv = dev->dev_private; | 989 | drm_r128_private_t *dev_priv = dev->dev_private; |
@@ -1105,7 +1105,7 @@ static int r128_cce_dispatch_write_pixels(drm_device_t * dev, | |||
1105 | return 0; | 1105 | return 0; |
1106 | } | 1106 | } |
1107 | 1107 | ||
1108 | static int r128_cce_dispatch_read_span(drm_device_t * dev, | 1108 | static int r128_cce_dispatch_read_span(struct drm_device * dev, |
1109 | drm_r128_depth_t * depth) | 1109 | drm_r128_depth_t * depth) |
1110 | { | 1110 | { |
1111 | drm_r128_private_t *dev_priv = dev->dev_private; | 1111 | drm_r128_private_t *dev_priv = dev->dev_private; |
@@ -1148,7 +1148,7 @@ static int r128_cce_dispatch_read_span(drm_device_t * dev, | |||
1148 | return 0; | 1148 | return 0; |
1149 | } | 1149 | } |
1150 | 1150 | ||
1151 | static int r128_cce_dispatch_read_pixels(drm_device_t * dev, | 1151 | static int r128_cce_dispatch_read_pixels(struct drm_device * dev, |
1152 | drm_r128_depth_t * depth) | 1152 | drm_r128_depth_t * depth) |
1153 | { | 1153 | { |
1154 | drm_r128_private_t *dev_priv = dev->dev_private; | 1154 | drm_r128_private_t *dev_priv = dev->dev_private; |
@@ -1220,7 +1220,7 @@ static int r128_cce_dispatch_read_pixels(drm_device_t * dev, | |||
1220 | * Polygon stipple | 1220 | * Polygon stipple |
1221 | */ | 1221 | */ |
1222 | 1222 | ||
1223 | static void r128_cce_dispatch_stipple(drm_device_t * dev, u32 * stipple) | 1223 | static void r128_cce_dispatch_stipple(struct drm_device * dev, u32 * stipple) |
1224 | { | 1224 | { |
1225 | drm_r128_private_t *dev_priv = dev->dev_private; | 1225 | drm_r128_private_t *dev_priv = dev->dev_private; |
1226 | int i; | 1226 | int i; |
@@ -1269,7 +1269,7 @@ static int r128_cce_clear(DRM_IOCTL_ARGS) | |||
1269 | return 0; | 1269 | return 0; |
1270 | } | 1270 | } |
1271 | 1271 | ||
1272 | static int r128_do_init_pageflip(drm_device_t * dev) | 1272 | static int r128_do_init_pageflip(struct drm_device * dev) |
1273 | { | 1273 | { |
1274 | drm_r128_private_t *dev_priv = dev->dev_private; | 1274 | drm_r128_private_t *dev_priv = dev->dev_private; |
1275 | DRM_DEBUG("\n"); | 1275 | DRM_DEBUG("\n"); |
@@ -1288,7 +1288,7 @@ static int r128_do_init_pageflip(drm_device_t * dev) | |||
1288 | return 0; | 1288 | return 0; |
1289 | } | 1289 | } |
1290 | 1290 | ||
1291 | static int r128_do_cleanup_pageflip(drm_device_t * dev) | 1291 | static int r128_do_cleanup_pageflip(struct drm_device * dev) |
1292 | { | 1292 | { |
1293 | drm_r128_private_t *dev_priv = dev->dev_private; | 1293 | drm_r128_private_t *dev_priv = dev->dev_private; |
1294 | DRM_DEBUG("\n"); | 1294 | DRM_DEBUG("\n"); |
@@ -1675,7 +1675,7 @@ static int r128_getparam(DRM_IOCTL_ARGS) | |||
1675 | return 0; | 1675 | return 0; |
1676 | } | 1676 | } |
1677 | 1677 | ||
1678 | void r128_driver_preclose(drm_device_t * dev, DRMFILE filp) | 1678 | void r128_driver_preclose(struct drm_device * dev, DRMFILE filp) |
1679 | { | 1679 | { |
1680 | if (dev->dev_private) { | 1680 | if (dev->dev_private) { |
1681 | drm_r128_private_t *dev_priv = dev->dev_private; | 1681 | drm_r128_private_t *dev_priv = dev->dev_private; |
@@ -1685,7 +1685,7 @@ void r128_driver_preclose(drm_device_t * dev, DRMFILE filp) | |||
1685 | } | 1685 | } |
1686 | } | 1686 | } |
1687 | 1687 | ||
1688 | void r128_driver_lastclose(drm_device_t * dev) | 1688 | void r128_driver_lastclose(struct drm_device * dev) |
1689 | { | 1689 | { |
1690 | r128_do_cleanup_cce(dev); | 1690 | r128_do_cleanup_cce(dev); |
1691 | } | 1691 | } |