diff options
author | Andi Kleen <ak@linux.intel.com> | 2011-10-13 19:08:43 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-10-18 04:44:38 -0400 |
commit | 74740c8324fdcb35f7dfca89075779528ff98827 (patch) | |
tree | c42ad97cb356efa1eb44dfd9f02d4c2a92560439 | |
parent | 488479ebcbdfabbc4d2ae3fab13971bba3ced605 (diff) |
drm/radeon: drop inlines in r600_blit.c
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/radeon/r600_blit.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/gpu/drm/radeon/r600_blit.c b/drivers/gpu/drm/radeon/r600_blit.c index 7f1043448d25..3c031a48205d 100644 --- a/drivers/gpu/drm/radeon/r600_blit.c +++ b/drivers/gpu/drm/radeon/r600_blit.c | |||
@@ -41,7 +41,7 @@ | |||
41 | #define COLOR_5_6_5 0x8 | 41 | #define COLOR_5_6_5 0x8 |
42 | #define COLOR_8_8_8_8 0x1a | 42 | #define COLOR_8_8_8_8 0x1a |
43 | 43 | ||
44 | static inline void | 44 | static void |
45 | set_render_target(drm_radeon_private_t *dev_priv, int format, int w, int h, u64 gpu_addr) | 45 | set_render_target(drm_radeon_private_t *dev_priv, int format, int w, int h, u64 gpu_addr) |
46 | { | 46 | { |
47 | u32 cb_color_info; | 47 | u32 cb_color_info; |
@@ -99,7 +99,7 @@ set_render_target(drm_radeon_private_t *dev_priv, int format, int w, int h, u64 | |||
99 | ADVANCE_RING(); | 99 | ADVANCE_RING(); |
100 | } | 100 | } |
101 | 101 | ||
102 | static inline void | 102 | static void |
103 | cp_set_surface_sync(drm_radeon_private_t *dev_priv, | 103 | cp_set_surface_sync(drm_radeon_private_t *dev_priv, |
104 | u32 sync_type, u32 size, u64 mc_addr) | 104 | u32 sync_type, u32 size, u64 mc_addr) |
105 | { | 105 | { |
@@ -121,7 +121,7 @@ cp_set_surface_sync(drm_radeon_private_t *dev_priv, | |||
121 | ADVANCE_RING(); | 121 | ADVANCE_RING(); |
122 | } | 122 | } |
123 | 123 | ||
124 | static inline void | 124 | static void |
125 | set_shaders(struct drm_device *dev) | 125 | set_shaders(struct drm_device *dev) |
126 | { | 126 | { |
127 | drm_radeon_private_t *dev_priv = dev->dev_private; | 127 | drm_radeon_private_t *dev_priv = dev->dev_private; |
@@ -184,7 +184,7 @@ set_shaders(struct drm_device *dev) | |||
184 | R600_SH_ACTION_ENA, 512, gpu_addr); | 184 | R600_SH_ACTION_ENA, 512, gpu_addr); |
185 | } | 185 | } |
186 | 186 | ||
187 | static inline void | 187 | static void |
188 | set_vtx_resource(drm_radeon_private_t *dev_priv, u64 gpu_addr) | 188 | set_vtx_resource(drm_radeon_private_t *dev_priv, u64 gpu_addr) |
189 | { | 189 | { |
190 | uint32_t sq_vtx_constant_word2; | 190 | uint32_t sq_vtx_constant_word2; |
@@ -220,7 +220,7 @@ set_vtx_resource(drm_radeon_private_t *dev_priv, u64 gpu_addr) | |||
220 | R600_VC_ACTION_ENA, 48, gpu_addr); | 220 | R600_VC_ACTION_ENA, 48, gpu_addr); |
221 | } | 221 | } |
222 | 222 | ||
223 | static inline void | 223 | static void |
224 | set_tex_resource(drm_radeon_private_t *dev_priv, | 224 | set_tex_resource(drm_radeon_private_t *dev_priv, |
225 | int format, int w, int h, int pitch, u64 gpu_addr) | 225 | int format, int w, int h, int pitch, u64 gpu_addr) |
226 | { | 226 | { |
@@ -258,7 +258,7 @@ set_tex_resource(drm_radeon_private_t *dev_priv, | |||
258 | 258 | ||
259 | } | 259 | } |
260 | 260 | ||
261 | static inline void | 261 | static void |
262 | set_scissors(drm_radeon_private_t *dev_priv, int x1, int y1, int x2, int y2) | 262 | set_scissors(drm_radeon_private_t *dev_priv, int x1, int y1, int x2, int y2) |
263 | { | 263 | { |
264 | RING_LOCALS; | 264 | RING_LOCALS; |
@@ -282,7 +282,7 @@ set_scissors(drm_radeon_private_t *dev_priv, int x1, int y1, int x2, int y2) | |||
282 | ADVANCE_RING(); | 282 | ADVANCE_RING(); |
283 | } | 283 | } |
284 | 284 | ||
285 | static inline void | 285 | static void |
286 | draw_auto(drm_radeon_private_t *dev_priv) | 286 | draw_auto(drm_radeon_private_t *dev_priv) |
287 | { | 287 | { |
288 | RING_LOCALS; | 288 | RING_LOCALS; |
@@ -311,7 +311,7 @@ draw_auto(drm_radeon_private_t *dev_priv) | |||
311 | COMMIT_RING(); | 311 | COMMIT_RING(); |
312 | } | 312 | } |
313 | 313 | ||
314 | static inline void | 314 | static void |
315 | set_default_state(drm_radeon_private_t *dev_priv) | 315 | set_default_state(drm_radeon_private_t *dev_priv) |
316 | { | 316 | { |
317 | int i; | 317 | int i; |
@@ -489,7 +489,7 @@ set_default_state(drm_radeon_private_t *dev_priv) | |||
489 | ADVANCE_RING(); | 489 | ADVANCE_RING(); |
490 | } | 490 | } |
491 | 491 | ||
492 | static inline uint32_t i2f(uint32_t input) | 492 | static uint32_t i2f(uint32_t input) |
493 | { | 493 | { |
494 | u32 result, i, exponent, fraction; | 494 | u32 result, i, exponent, fraction; |
495 | 495 | ||
@@ -515,7 +515,7 @@ static inline uint32_t i2f(uint32_t input) | |||
515 | } | 515 | } |
516 | 516 | ||
517 | 517 | ||
518 | static inline int r600_nomm_get_vb(struct drm_device *dev) | 518 | static int r600_nomm_get_vb(struct drm_device *dev) |
519 | { | 519 | { |
520 | drm_radeon_private_t *dev_priv = dev->dev_private; | 520 | drm_radeon_private_t *dev_priv = dev->dev_private; |
521 | dev_priv->blit_vb = radeon_freelist_get(dev); | 521 | dev_priv->blit_vb = radeon_freelist_get(dev); |
@@ -526,7 +526,7 @@ static inline int r600_nomm_get_vb(struct drm_device *dev) | |||
526 | return 0; | 526 | return 0; |
527 | } | 527 | } |
528 | 528 | ||
529 | static inline void r600_nomm_put_vb(struct drm_device *dev) | 529 | static void r600_nomm_put_vb(struct drm_device *dev) |
530 | { | 530 | { |
531 | drm_radeon_private_t *dev_priv = dev->dev_private; | 531 | drm_radeon_private_t *dev_priv = dev->dev_private; |
532 | 532 | ||
@@ -534,7 +534,7 @@ static inline void r600_nomm_put_vb(struct drm_device *dev) | |||
534 | radeon_cp_discard_buffer(dev, dev_priv->blit_vb->file_priv->master, dev_priv->blit_vb); | 534 | radeon_cp_discard_buffer(dev, dev_priv->blit_vb->file_priv->master, dev_priv->blit_vb); |
535 | } | 535 | } |
536 | 536 | ||
537 | static inline void *r600_nomm_get_vb_ptr(struct drm_device *dev) | 537 | static void *r600_nomm_get_vb_ptr(struct drm_device *dev) |
538 | { | 538 | { |
539 | drm_radeon_private_t *dev_priv = dev->dev_private; | 539 | drm_radeon_private_t *dev_priv = dev->dev_private; |
540 | return (((char *)dev->agp_buffer_map->handle + | 540 | return (((char *)dev->agp_buffer_map->handle + |