diff options
author | Dave Airlie <airlied@linux.ie> | 2007-07-11 01:53:27 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2007-07-11 01:53:27 -0400 |
commit | 84b1fd103dbbe01b5905db1444d3fc8afa9a7207 (patch) | |
tree | 2088f4c8e68553e2d4f5d55fa7a714eb3fa09f9e /drivers/char/drm/radeon_cp.c | |
parent | c60ce623bd16137627009d05e311d877729f2ad6 (diff) |
drm: remove drm_file_t, drm_device_t and drm_head_t typedefs
some drivers still todo.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/radeon_cp.c')
-rw-r--r-- | drivers/char/drm/radeon_cp.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c index cfc5aa16de22..d75a0ee5f47c 100644 --- a/drivers/char/drm/radeon_cp.c +++ b/drivers/char/drm/radeon_cp.c | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | #define RADEON_FIFO_DEBUG 0 | 37 | #define RADEON_FIFO_DEBUG 0 |
38 | 38 | ||
39 | static int radeon_do_cleanup_cp(drm_device_t * dev); | 39 | static int radeon_do_cleanup_cp(struct drm_device * dev); |
40 | 40 | ||
41 | /* CP microcode (from ATI) */ | 41 | /* CP microcode (from ATI) */ |
42 | static const u32 R200_cp_microcode[][2] = { | 42 | static const u32 R200_cp_microcode[][2] = { |
@@ -816,7 +816,7 @@ static const u32 R300_cp_microcode[][2] = { | |||
816 | {0000000000, 0000000000}, | 816 | {0000000000, 0000000000}, |
817 | }; | 817 | }; |
818 | 818 | ||
819 | static int RADEON_READ_PLL(drm_device_t * dev, int addr) | 819 | static int RADEON_READ_PLL(struct drm_device * dev, int addr) |
820 | { | 820 | { |
821 | drm_radeon_private_t *dev_priv = dev->dev_private; | 821 | drm_radeon_private_t *dev_priv = dev->dev_private; |
822 | 822 | ||
@@ -1066,7 +1066,7 @@ static void radeon_do_cp_stop(drm_radeon_private_t * dev_priv) | |||
1066 | 1066 | ||
1067 | /* Reset the engine. This will stop the CP if it is running. | 1067 | /* Reset the engine. This will stop the CP if it is running. |
1068 | */ | 1068 | */ |
1069 | static int radeon_do_engine_reset(drm_device_t * dev) | 1069 | static int radeon_do_engine_reset(struct drm_device * dev) |
1070 | { | 1070 | { |
1071 | drm_radeon_private_t *dev_priv = dev->dev_private; | 1071 | drm_radeon_private_t *dev_priv = dev->dev_private; |
1072 | u32 clock_cntl_index, mclk_cntl, rbbm_soft_reset; | 1072 | u32 clock_cntl_index, mclk_cntl, rbbm_soft_reset; |
@@ -1122,7 +1122,7 @@ static int radeon_do_engine_reset(drm_device_t * dev) | |||
1122 | return 0; | 1122 | return 0; |
1123 | } | 1123 | } |
1124 | 1124 | ||
1125 | static void radeon_cp_init_ring_buffer(drm_device_t * dev, | 1125 | static void radeon_cp_init_ring_buffer(struct drm_device * dev, |
1126 | drm_radeon_private_t * dev_priv) | 1126 | drm_radeon_private_t * dev_priv) |
1127 | { | 1127 | { |
1128 | u32 ring_start, cur_read_ptr; | 1128 | u32 ring_start, cur_read_ptr; |
@@ -1384,7 +1384,7 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on) | |||
1384 | } | 1384 | } |
1385 | } | 1385 | } |
1386 | 1386 | ||
1387 | static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init) | 1387 | static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init) |
1388 | { | 1388 | { |
1389 | drm_radeon_private_t *dev_priv = dev->dev_private; | 1389 | drm_radeon_private_t *dev_priv = dev->dev_private; |
1390 | 1390 | ||
@@ -1735,7 +1735,7 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init) | |||
1735 | return 0; | 1735 | return 0; |
1736 | } | 1736 | } |
1737 | 1737 | ||
1738 | static int radeon_do_cleanup_cp(drm_device_t * dev) | 1738 | static int radeon_do_cleanup_cp(struct drm_device * dev) |
1739 | { | 1739 | { |
1740 | drm_radeon_private_t *dev_priv = dev->dev_private; | 1740 | drm_radeon_private_t *dev_priv = dev->dev_private; |
1741 | DRM_DEBUG("\n"); | 1741 | DRM_DEBUG("\n"); |
@@ -1791,7 +1791,7 @@ static int radeon_do_cleanup_cp(drm_device_t * dev) | |||
1791 | * | 1791 | * |
1792 | * Charl P. Botha <http://cpbotha.net> | 1792 | * Charl P. Botha <http://cpbotha.net> |
1793 | */ | 1793 | */ |
1794 | static int radeon_do_resume_cp(drm_device_t * dev) | 1794 | static int radeon_do_resume_cp(struct drm_device * dev) |
1795 | { | 1795 | { |
1796 | drm_radeon_private_t *dev_priv = dev->dev_private; | 1796 | drm_radeon_private_t *dev_priv = dev->dev_private; |
1797 | 1797 | ||
@@ -1918,7 +1918,7 @@ int radeon_cp_stop(DRM_IOCTL_ARGS) | |||
1918 | return 0; | 1918 | return 0; |
1919 | } | 1919 | } |
1920 | 1920 | ||
1921 | void radeon_do_release(drm_device_t * dev) | 1921 | void radeon_do_release(struct drm_device * dev) |
1922 | { | 1922 | { |
1923 | drm_radeon_private_t *dev_priv = dev->dev_private; | 1923 | drm_radeon_private_t *dev_priv = dev->dev_private; |
1924 | int i, ret; | 1924 | int i, ret; |
@@ -2046,7 +2046,7 @@ 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(drm_device_t * dev) | 2049 | drm_buf_t *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; |
@@ -2086,7 +2086,7 @@ drm_buf_t *radeon_freelist_get(drm_device_t * dev) | |||
2086 | } | 2086 | } |
2087 | 2087 | ||
2088 | #if 0 | 2088 | #if 0 |
2089 | drm_buf_t *radeon_freelist_get(drm_device_t * dev) | 2089 | drm_buf_t *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; |
@@ -2120,7 +2120,7 @@ drm_buf_t *radeon_freelist_get(drm_device_t * dev) | |||
2120 | } | 2120 | } |
2121 | #endif | 2121 | #endif |
2122 | 2122 | ||
2123 | void radeon_freelist_reset(drm_device_t * dev) | 2123 | void radeon_freelist_reset(struct drm_device * dev) |
2124 | { | 2124 | { |
2125 | drm_device_dma_t *dma = dev->dma; | 2125 | drm_device_dma_t *dma = dev->dma; |
2126 | drm_radeon_private_t *dev_priv = dev->dev_private; | 2126 | drm_radeon_private_t *dev_priv = dev->dev_private; |
@@ -2170,7 +2170,7 @@ int radeon_wait_ring(drm_radeon_private_t * dev_priv, int n) | |||
2170 | return DRM_ERR(EBUSY); | 2170 | return DRM_ERR(EBUSY); |
2171 | } | 2171 | } |
2172 | 2172 | ||
2173 | static int radeon_cp_get_buffers(DRMFILE filp, drm_device_t * dev, | 2173 | 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; |