Skip to content

Commit

Permalink
drm/radeon: drop inlines in r600_blit.c
Browse files Browse the repository at this point in the history 
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Andi Kleen authored and Dave Airlie committed Oct 18, 2011
1 parent 488479e commit 74740c8
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions drivers/gpu/drm/radeon/r600_blit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#define COLOR_5_6_5 0x8
#define COLOR_8_8_8_8 0x1a

static inline void
static void
set_render_target(drm_radeon_private_t *dev_priv, int format, int w, int h, u64 gpu_addr)
{
u32 cb_color_info;
Expand Down Expand Up @@ -99,7 +99,7 @@ set_render_target(drm_radeon_private_t *dev_priv, int format, int w, int h, u64
ADVANCE_RING();
}

static inline void
static void
cp_set_surface_sync(drm_radeon_private_t *dev_priv,
u32 sync_type, u32 size, u64 mc_addr)
{
Expand All @@ -121,7 +121,7 @@ cp_set_surface_sync(drm_radeon_private_t *dev_priv,
ADVANCE_RING();
}

static inline void
static void
set_shaders(struct drm_device *dev)
{
drm_radeon_private_t *dev_priv = dev->dev_private;
Expand Down Expand Up @@ -184,7 +184,7 @@ set_shaders(struct drm_device *dev)
R600_SH_ACTION_ENA, 512, gpu_addr);
}

static inline void
static void
set_vtx_resource(drm_radeon_private_t *dev_priv, u64 gpu_addr)
{
uint32_t sq_vtx_constant_word2;
Expand Down Expand Up @@ -220,7 +220,7 @@ set_vtx_resource(drm_radeon_private_t *dev_priv, u64 gpu_addr)
R600_VC_ACTION_ENA, 48, gpu_addr);
}

static inline void
static void
set_tex_resource(drm_radeon_private_t *dev_priv,
int format, int w, int h, int pitch, u64 gpu_addr)
{
Expand Down Expand Up @@ -258,7 +258,7 @@ set_tex_resource(drm_radeon_private_t *dev_priv,

}

static inline void
static void
set_scissors(drm_radeon_private_t *dev_priv, int x1, int y1, int x2, int y2)
{
RING_LOCALS;
Expand All @@ -282,7 +282,7 @@ set_scissors(drm_radeon_private_t *dev_priv, int x1, int y1, int x2, int y2)
ADVANCE_RING();
}

static inline void
static void
draw_auto(drm_radeon_private_t *dev_priv)
{
RING_LOCALS;
Expand Down Expand Up @@ -311,7 +311,7 @@ draw_auto(drm_radeon_private_t *dev_priv)
COMMIT_RING();
}

static inline void
static void
set_default_state(drm_radeon_private_t *dev_priv)
{
int i;
Expand Down Expand Up @@ -489,7 +489,7 @@ set_default_state(drm_radeon_private_t *dev_priv)
ADVANCE_RING();
}

static inline uint32_t i2f(uint32_t input)
static uint32_t i2f(uint32_t input)
{
u32 result, i, exponent, fraction;

Expand All @@ -515,7 +515,7 @@ static inline uint32_t i2f(uint32_t input)
}


static inline int r600_nomm_get_vb(struct drm_device *dev)
static int r600_nomm_get_vb(struct drm_device *dev)
{
drm_radeon_private_t *dev_priv = dev->dev_private;
dev_priv->blit_vb = radeon_freelist_get(dev);
Expand All @@ -526,15 +526,15 @@ static inline int r600_nomm_get_vb(struct drm_device *dev)
return 0;
}

static inline void r600_nomm_put_vb(struct drm_device *dev)
static void r600_nomm_put_vb(struct drm_device *dev)
{
drm_radeon_private_t *dev_priv = dev->dev_private;

dev_priv->blit_vb->used = 0;
radeon_cp_discard_buffer(dev, dev_priv->blit_vb->file_priv->master, dev_priv->blit_vb);
}

static inline void *r600_nomm_get_vb_ptr(struct drm_device *dev)
static void *r600_nomm_get_vb_ptr(struct drm_device *dev)
{
drm_radeon_private_t *dev_priv = dev->dev_private;
return (((char *)dev->agp_buffer_map->handle +
Expand Down

0 comments on commit 74740c8

Please sign in to comment.