Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74740c83 authored by Andi Kleen's avatar Andi Kleen Committed by Dave Airlie
Browse files

drm/radeon: drop inlines in r600_blit.c 



Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 488479eb

drivers/gpu/drm/radeon/r600_blit.c

+12 −12
Original line number Diff line number Diff line
@@ -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;
@@ -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)

{
@@ -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;
@@ -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;
@@ -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)

{
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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);
@@ -526,7 +526,7 @@ 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;
@@ -534,7 +534,7 @@ static inline void r600_nomm_put_vb(struct drm_device *dev) 
	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 +