diff options
Diffstat (limited to 'drivers/char/drm/mga_state.c')
-rw-r--r-- | drivers/char/drm/mga_state.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/char/drm/mga_state.c b/drivers/char/drm/mga_state.c index 2837e669183a..6d5ab9ff69c7 100644 --- a/drivers/char/drm/mga_state.c +++ b/drivers/char/drm/mga_state.c | |||
@@ -42,7 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | static void mga_emit_clip_rect(drm_mga_private_t * dev_priv, | 44 | static void mga_emit_clip_rect(drm_mga_private_t * dev_priv, |
45 | drm_clip_rect_t * box) | 45 | struct drm_clip_rect * box) |
46 | { | 46 | { |
47 | drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; | 47 | drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; |
48 | drm_mga_context_regs_t *ctx = &sarea_priv->context_state; | 48 | drm_mga_context_regs_t *ctx = &sarea_priv->context_state; |
@@ -480,12 +480,12 @@ static int mga_verify_blit(drm_mga_private_t * dev_priv, | |||
480 | * | 480 | * |
481 | */ | 481 | */ |
482 | 482 | ||
483 | static void mga_dma_dispatch_clear(drm_device_t * dev, drm_mga_clear_t * clear) | 483 | static void mga_dma_dispatch_clear(struct drm_device * dev, drm_mga_clear_t * clear) |
484 | { | 484 | { |
485 | drm_mga_private_t *dev_priv = dev->dev_private; | 485 | drm_mga_private_t *dev_priv = dev->dev_private; |
486 | drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; | 486 | drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; |
487 | drm_mga_context_regs_t *ctx = &sarea_priv->context_state; | 487 | drm_mga_context_regs_t *ctx = &sarea_priv->context_state; |
488 | drm_clip_rect_t *pbox = sarea_priv->boxes; | 488 | struct drm_clip_rect *pbox = sarea_priv->boxes; |
489 | int nbox = sarea_priv->nbox; | 489 | int nbox = sarea_priv->nbox; |
490 | int i; | 490 | int i; |
491 | DMA_LOCALS; | 491 | DMA_LOCALS; |
@@ -500,7 +500,7 @@ static void mga_dma_dispatch_clear(drm_device_t * dev, drm_mga_clear_t * clear) | |||
500 | ADVANCE_DMA(); | 500 | ADVANCE_DMA(); |
501 | 501 | ||
502 | for (i = 0; i < nbox; i++) { | 502 | for (i = 0; i < nbox; i++) { |
503 | drm_clip_rect_t *box = &pbox[i]; | 503 | struct drm_clip_rect *box = &pbox[i]; |
504 | u32 height = box->y2 - box->y1; | 504 | u32 height = box->y2 - box->y1; |
505 | 505 | ||
506 | DRM_DEBUG(" from=%d,%d to=%d,%d\n", | 506 | DRM_DEBUG(" from=%d,%d to=%d,%d\n", |
@@ -568,12 +568,12 @@ static void mga_dma_dispatch_clear(drm_device_t * dev, drm_mga_clear_t * clear) | |||
568 | FLUSH_DMA(); | 568 | FLUSH_DMA(); |
569 | } | 569 | } |
570 | 570 | ||
571 | static void mga_dma_dispatch_swap(drm_device_t * dev) | 571 | static void mga_dma_dispatch_swap(struct drm_device * dev) |
572 | { | 572 | { |
573 | drm_mga_private_t *dev_priv = dev->dev_private; | 573 | drm_mga_private_t *dev_priv = dev->dev_private; |
574 | drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; | 574 | drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; |
575 | drm_mga_context_regs_t *ctx = &sarea_priv->context_state; | 575 | drm_mga_context_regs_t *ctx = &sarea_priv->context_state; |
576 | drm_clip_rect_t *pbox = sarea_priv->boxes; | 576 | struct drm_clip_rect *pbox = sarea_priv->boxes; |
577 | int nbox = sarea_priv->nbox; | 577 | int nbox = sarea_priv->nbox; |
578 | int i; | 578 | int i; |
579 | DMA_LOCALS; | 579 | DMA_LOCALS; |
@@ -598,7 +598,7 @@ static void mga_dma_dispatch_swap(drm_device_t * dev) | |||
598 | MGA_PLNWT, 0xffffffff, MGA_DWGCTL, MGA_DWGCTL_COPY); | 598 | MGA_PLNWT, 0xffffffff, MGA_DWGCTL, MGA_DWGCTL_COPY); |
599 | 599 | ||
600 | for (i = 0; i < nbox; i++) { | 600 | for (i = 0; i < nbox; i++) { |
601 | drm_clip_rect_t *box = &pbox[i]; | 601 | struct drm_clip_rect *box = &pbox[i]; |
602 | u32 height = box->y2 - box->y1; | 602 | u32 height = box->y2 - box->y1; |
603 | u32 start = box->y1 * dev_priv->front_pitch; | 603 | u32 start = box->y1 * dev_priv->front_pitch; |
604 | 604 | ||
@@ -622,7 +622,7 @@ static void mga_dma_dispatch_swap(drm_device_t * dev) | |||
622 | DRM_DEBUG("%s... done.\n", __FUNCTION__); | 622 | DRM_DEBUG("%s... done.\n", __FUNCTION__); |
623 | } | 623 | } |
624 | 624 | ||
625 | static void mga_dma_dispatch_vertex(drm_device_t * dev, drm_buf_t * buf) | 625 | static void mga_dma_dispatch_vertex(struct drm_device * dev, drm_buf_t * buf) |
626 | { | 626 | { |
627 | drm_mga_private_t *dev_priv = dev->dev_private; | 627 | drm_mga_private_t *dev_priv = dev->dev_private; |
628 | drm_mga_buf_priv_t *buf_priv = buf->dev_private; | 628 | drm_mga_buf_priv_t *buf_priv = buf->dev_private; |
@@ -669,7 +669,7 @@ static void mga_dma_dispatch_vertex(drm_device_t * dev, drm_buf_t * buf) | |||
669 | FLUSH_DMA(); | 669 | FLUSH_DMA(); |
670 | } | 670 | } |
671 | 671 | ||
672 | static void mga_dma_dispatch_indices(drm_device_t * dev, drm_buf_t * buf, | 672 | static void mga_dma_dispatch_indices(struct drm_device * dev, drm_buf_t * buf, |
673 | unsigned int start, unsigned int end) | 673 | unsigned int start, unsigned int end) |
674 | { | 674 | { |
675 | drm_mga_private_t *dev_priv = dev->dev_private; | 675 | drm_mga_private_t *dev_priv = dev->dev_private; |
@@ -718,7 +718,7 @@ static void mga_dma_dispatch_indices(drm_device_t * dev, drm_buf_t * buf, | |||
718 | /* This copies a 64 byte aligned agp region to the frambuffer with a | 718 | /* This copies a 64 byte aligned agp region to the frambuffer with a |
719 | * standard blit, the ioctl needs to do checking. | 719 | * standard blit, the ioctl needs to do checking. |
720 | */ | 720 | */ |
721 | static void mga_dma_dispatch_iload(drm_device_t * dev, drm_buf_t * buf, | 721 | static void mga_dma_dispatch_iload(struct drm_device * dev, drm_buf_t * buf, |
722 | unsigned int dstorg, unsigned int length) | 722 | unsigned int dstorg, unsigned int length) |
723 | { | 723 | { |
724 | drm_mga_private_t *dev_priv = dev->dev_private; | 724 | drm_mga_private_t *dev_priv = dev->dev_private; |
@@ -766,12 +766,12 @@ static void mga_dma_dispatch_iload(drm_device_t * dev, drm_buf_t * buf, | |||
766 | FLUSH_DMA(); | 766 | FLUSH_DMA(); |
767 | } | 767 | } |
768 | 768 | ||
769 | static void mga_dma_dispatch_blit(drm_device_t * dev, drm_mga_blit_t * blit) | 769 | static void mga_dma_dispatch_blit(struct drm_device * dev, drm_mga_blit_t * blit) |
770 | { | 770 | { |
771 | drm_mga_private_t *dev_priv = dev->dev_private; | 771 | drm_mga_private_t *dev_priv = dev->dev_private; |
772 | drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; | 772 | drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; |
773 | drm_mga_context_regs_t *ctx = &sarea_priv->context_state; | 773 | drm_mga_context_regs_t *ctx = &sarea_priv->context_state; |
774 | drm_clip_rect_t *pbox = sarea_priv->boxes; | 774 | struct drm_clip_rect *pbox = sarea_priv->boxes; |
775 | int nbox = sarea_priv->nbox; | 775 | int nbox = sarea_priv->nbox; |
776 | u32 scandir = 0, i; | 776 | u32 scandir = 0, i; |
777 | DMA_LOCALS; | 777 | DMA_LOCALS; |