aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/radeon_state.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/drm/radeon_state.c')
-rw-r--r--drivers/char/drm/radeon_state.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index 2f325c79915..3de58c3f97b 100644
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
@@ -1492,7 +1492,7 @@ typedef struct {
1492} drm_radeon_tcl_prim_t; 1492} drm_radeon_tcl_prim_t;
1493 1493
1494static void radeon_cp_dispatch_vertex(struct drm_device * dev, 1494static void radeon_cp_dispatch_vertex(struct drm_device * dev,
1495 drm_buf_t * buf, 1495 struct drm_buf * buf,
1496 drm_radeon_tcl_prim_t * prim) 1496 drm_radeon_tcl_prim_t * prim)
1497{ 1497{
1498 drm_radeon_private_t *dev_priv = dev->dev_private; 1498 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -1537,7 +1537,7 @@ static void radeon_cp_dispatch_vertex(struct drm_device * dev,
1537 } while (i < nbox); 1537 } while (i < nbox);
1538} 1538}
1539 1539
1540static void radeon_cp_discard_buffer(struct drm_device * dev, drm_buf_t * buf) 1540static void radeon_cp_discard_buffer(struct drm_device * dev, struct drm_buf * buf)
1541{ 1541{
1542 drm_radeon_private_t *dev_priv = dev->dev_private; 1542 drm_radeon_private_t *dev_priv = dev->dev_private;
1543 drm_radeon_buf_priv_t *buf_priv = buf->dev_private; 1543 drm_radeon_buf_priv_t *buf_priv = buf->dev_private;
@@ -1555,7 +1555,7 @@ static void radeon_cp_discard_buffer(struct drm_device * dev, drm_buf_t * buf)
1555} 1555}
1556 1556
1557static void radeon_cp_dispatch_indirect(struct drm_device * dev, 1557static void radeon_cp_dispatch_indirect(struct drm_device * dev,
1558 drm_buf_t * buf, int start, int end) 1558 struct drm_buf * buf, int start, int end)
1559{ 1559{
1560 drm_radeon_private_t *dev_priv = dev->dev_private; 1560 drm_radeon_private_t *dev_priv = dev->dev_private;
1561 RING_LOCALS; 1561 RING_LOCALS;
@@ -1589,7 +1589,7 @@ static void radeon_cp_dispatch_indirect(struct drm_device * dev,
1589} 1589}
1590 1590
1591static void radeon_cp_dispatch_indices(struct drm_device * dev, 1591static void radeon_cp_dispatch_indices(struct drm_device * dev,
1592 drm_buf_t * elt_buf, 1592 struct drm_buf * elt_buf,
1593 drm_radeon_tcl_prim_t * prim) 1593 drm_radeon_tcl_prim_t * prim)
1594{ 1594{
1595 drm_radeon_private_t *dev_priv = dev->dev_private; 1595 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -1653,7 +1653,7 @@ static int radeon_cp_dispatch_texture(DRMFILE filp,
1653{ 1653{
1654 drm_radeon_private_t *dev_priv = dev->dev_private; 1654 drm_radeon_private_t *dev_priv = dev->dev_private;
1655 struct drm_file *filp_priv; 1655 struct drm_file *filp_priv;
1656 drm_buf_t *buf; 1656 struct drm_buf *buf;
1657 u32 format; 1657 u32 format;
1658 u32 *buffer; 1658 u32 *buffer;
1659 const u8 __user *data; 1659 const u8 __user *data;
@@ -2209,7 +2209,7 @@ static int radeon_cp_vertex(DRM_IOCTL_ARGS)
2209 struct drm_file *filp_priv; 2209 struct drm_file *filp_priv;
2210 drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; 2210 drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
2211 drm_device_dma_t *dma = dev->dma; 2211 drm_device_dma_t *dma = dev->dma;
2212 drm_buf_t *buf; 2212 struct drm_buf *buf;
2213 drm_radeon_vertex_t vertex; 2213 drm_radeon_vertex_t vertex;
2214 drm_radeon_tcl_prim_t prim; 2214 drm_radeon_tcl_prim_t prim;
2215 2215
@@ -2292,7 +2292,7 @@ static int radeon_cp_indices(DRM_IOCTL_ARGS)
2292 struct drm_file *filp_priv; 2292 struct drm_file *filp_priv;
2293 drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; 2293 drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
2294 drm_device_dma_t *dma = dev->dma; 2294 drm_device_dma_t *dma = dev->dma;
2295 drm_buf_t *buf; 2295 struct drm_buf *buf;
2296 drm_radeon_indices_t elts; 2296 drm_radeon_indices_t elts;
2297 drm_radeon_tcl_prim_t prim; 2297 drm_radeon_tcl_prim_t prim;
2298 int count; 2298 int count;
@@ -2439,7 +2439,7 @@ static int radeon_cp_indirect(DRM_IOCTL_ARGS)
2439 DRM_DEVICE; 2439 DRM_DEVICE;
2440 drm_radeon_private_t *dev_priv = dev->dev_private; 2440 drm_radeon_private_t *dev_priv = dev->dev_private;
2441 drm_device_dma_t *dma = dev->dma; 2441 drm_device_dma_t *dma = dev->dma;
2442 drm_buf_t *buf; 2442 struct drm_buf *buf;
2443 drm_radeon_indirect_t indirect; 2443 drm_radeon_indirect_t indirect;
2444 RING_LOCALS; 2444 RING_LOCALS;
2445 2445
@@ -2510,7 +2510,7 @@ static int radeon_cp_vertex2(DRM_IOCTL_ARGS)
2510 struct drm_file *filp_priv; 2510 struct drm_file *filp_priv;
2511 drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; 2511 drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
2512 drm_device_dma_t *dma = dev->dma; 2512 drm_device_dma_t *dma = dev->dma;
2513 drm_buf_t *buf; 2513 struct drm_buf *buf;
2514 drm_radeon_vertex2_t vertex; 2514 drm_radeon_vertex2_t vertex;
2515 int i; 2515 int i;
2516 unsigned char laststate; 2516 unsigned char laststate;
@@ -2851,7 +2851,7 @@ static int radeon_cp_cmdbuf(DRM_IOCTL_ARGS)
2851 drm_radeon_private_t *dev_priv = dev->dev_private; 2851 drm_radeon_private_t *dev_priv = dev->dev_private;
2852 struct drm_file *filp_priv; 2852 struct drm_file *filp_priv;
2853 drm_device_dma_t *dma = dev->dma; 2853 drm_device_dma_t *dma = dev->dma;
2854 drm_buf_t *buf = NULL; 2854 struct drm_buf *buf = NULL;
2855 int idx; 2855 int idx;
2856 drm_radeon_kcmd_buffer_t cmdbuf; 2856 drm_radeon_kcmd_buffer_t cmdbuf;
2857 drm_radeon_cmd_header_t header; 2857 drm_radeon_cmd_header_t header;