dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

drm/radeon: Drop inlines from evergreen_cs.c / r600_cs.c

Browse source 
Fixes

evergreen_cs_parse                          4080   23124  +19044

and others compared to a non force inline kernel.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Andi Kleen 2011-10-13 16:08:41 -07:00 committed by Dave Airlie
parent 1c482ab359
commit 488479ebcb
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/radeon/evergreen_cs.c
View file

@ -122,7 +122,7 @@ static void evergreen_cs_track_init(struct evergreen_cs_track *track)
track->db_s_write_bo = NULL; track->db_s_write_bo = NULL;
} }
static inline int evergreen_cs_track_validate_cb(struct radeon_cs_parser *p, int i) static int evergreen_cs_track_validate_cb(struct radeon_cs_parser *p, int i)
{ {
/* XXX fill in */ /* XXX fill in */
return 0; return 0;
@ -242,7 +242,7 @@ static int evergreen_cs_packet_next_reloc(struct radeon_cs_parser *p,
* Check next packet is relocation packet3, do bo validation and compute * Check next packet is relocation packet3, do bo validation and compute
* GPU offset using the provided start. * GPU offset using the provided start.
**/ **/
static inline int evergreen_cs_packet_next_is_pkt3_nop(struct radeon_cs_parser *p) static int evergreen_cs_packet_next_is_pkt3_nop(struct radeon_cs_parser *p)
{ {
struct radeon_cs_packet p3reloc; struct radeon_cs_packet p3reloc;
int r; int r;
@ -414,7 +414,7 @@ static int evergreen_cs_parse_packet0(struct radeon_cs_parser *p,
* if register is safe. If register is not flag as safe this function * if register is safe. If register is not flag as safe this function
* will test it against a list of register needind special handling. * will test it against a list of register needind special handling.
*/ */
static inline int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) static int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
{ {
struct evergreen_cs_track *track = (struct evergreen_cs_track *)p->track; struct evergreen_cs_track *track = (struct evergreen_cs_track *)p->track;
struct radeon_cs_reloc *reloc; struct radeon_cs_reloc *reloc;
@ -990,7 +990,7 @@ static inline int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u3
* This function will check that the resource has valid field and that * This function will check that the resource has valid field and that
* the texture and mipmap bo object are big enough to cover this resource. * the texture and mipmap bo object are big enough to cover this resource.
*/ */
static inline int evergreen_check_texture_resource(struct radeon_cs_parser *p, u32 idx, static int evergreen_check_texture_resource(struct radeon_cs_parser *p, u32 idx,
struct radeon_bo *texture, struct radeon_bo *texture,
struct radeon_bo *mipmap) struct radeon_bo *mipmap)
{ {

24
drivers/gpu/drm/radeon/r600_cs.c
View file

@ -162,7 +162,7 @@ static const struct gpu_formats color_formats_table[] = {
[V_038004_FMT_32_AS_32_32_32_32] = { 1, 1, 4, 0, CHIP_CEDAR}, [V_038004_FMT_32_AS_32_32_32_32] = { 1, 1, 4, 0, CHIP_CEDAR},
}; };
static inline bool fmt_is_valid_color(u32 format) static bool fmt_is_valid_color(u32 format)
{ {
if (format >= ARRAY_SIZE(color_formats_table)) if (format >= ARRAY_SIZE(color_formats_table))
return false; return false;
@ -173,7 +173,7 @@ static inline bool fmt_is_valid_color(u32 format)
return false; return false;
} }
static inline bool fmt_is_valid_texture(u32 format, enum radeon_family family) static bool fmt_is_valid_texture(u32 format, enum radeon_family family)
{ {
if (format >= ARRAY_SIZE(color_formats_table)) if (format >= ARRAY_SIZE(color_formats_table))
return false; return false;
@ -187,7 +187,7 @@ static inline bool fmt_is_valid_texture(u32 format, enum radeon_family family)
return false; return false;
} }
static inline int fmt_get_blocksize(u32 format) static int fmt_get_blocksize(u32 format)
{ {
if (format >= ARRAY_SIZE(color_formats_table)) if (format >= ARRAY_SIZE(color_formats_table))
return 0; return 0;
@ -195,7 +195,7 @@ static inline int fmt_get_blocksize(u32 format)
return color_formats_table[format].blocksize; return color_formats_table[format].blocksize;
} }
static inline int fmt_get_nblocksx(u32 format, u32 w) static int fmt_get_nblocksx(u32 format, u32 w)
{ {
unsigned bw; unsigned bw;
@ -209,7 +209,7 @@ static inline int fmt_get_nblocksx(u32 format, u32 w)
return (w + bw - 1) / bw; return (w + bw - 1) / bw;
} }
static inline int fmt_get_nblocksy(u32 format, u32 h) static int fmt_get_nblocksy(u32 format, u32 h)
{ {
unsigned bh; unsigned bh;
@ -223,7 +223,7 @@ static inline int fmt_get_nblocksy(u32 format, u32 h)
return (h + bh - 1) / bh; return (h + bh - 1) / bh;
} }
static inline int r600_bpe_from_format(u32 *bpe, u32 format) static int r600_bpe_from_format(u32 *bpe, u32 format)
{ {
unsigned res; unsigned res;
@ -252,7 +252,7 @@ struct array_mode_checker {
}; };
/* returns alignment in pixels for pitch/height/depth and bytes for base */ /* returns alignment in pixels for pitch/height/depth and bytes for base */
static inline int r600_get_array_mode_alignment(struct array_mode_checker *values, static int r600_get_array_mode_alignment(struct array_mode_checker *values,
u32 *pitch_align, u32 *pitch_align,
u32 *height_align, u32 *height_align,
u32 *depth_align, u32 *depth_align,
@ -331,7 +331,7 @@ static void r600_cs_track_init(struct r600_cs_track *track)
track->db_depth_control = 0xFFFFFFFF; track->db_depth_control = 0xFFFFFFFF;
} }
static inline int r600_cs_track_validate_cb(struct radeon_cs_parser *p, int i) static int r600_cs_track_validate_cb(struct radeon_cs_parser *p, int i)
{ {
struct r600_cs_track *track = p->track; struct r600_cs_track *track = p->track;
u32 slice_tile_max, size, tmp; u32 slice_tile_max, size, tmp;
@ -737,7 +737,7 @@ static int r600_cs_packet_next_reloc_nomm(struct radeon_cs_parser *p,
* Check next packet is relocation packet3, do bo validation and compute * Check next packet is relocation packet3, do bo validation and compute
* GPU offset using the provided start. * GPU offset using the provided start.
**/ **/
static inline int r600_cs_packet_next_is_pkt3_nop(struct radeon_cs_parser *p) static int r600_cs_packet_next_is_pkt3_nop(struct radeon_cs_parser *p)
{ {
struct radeon_cs_packet p3reloc; struct radeon_cs_packet p3reloc;
int r; int r;
@ -911,7 +911,7 @@ static int r600_cs_parse_packet0(struct radeon_cs_parser *p,
* if register is safe. If register is not flag as safe this function * if register is safe. If register is not flag as safe this function
* will test it against a list of register needind special handling. * will test it against a list of register needind special handling.
*/ */
static inline int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) static int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
{ {
struct r600_cs_track *track = (struct r600_cs_track *)p->track; struct r600_cs_track *track = (struct r600_cs_track *)p->track;
struct radeon_cs_reloc *reloc; struct radeon_cs_reloc *reloc;
@ -1215,7 +1215,7 @@ static inline int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx
return 0; return 0;
} }
static inline unsigned mip_minify(unsigned size, unsigned level) static unsigned mip_minify(unsigned size, unsigned level)
{ {
unsigned val; unsigned val;
@ -1285,7 +1285,7 @@ static void r600_texture_size(unsigned nfaces, unsigned blevel, unsigned llevel,
* This function will check that the resource has valid field and that * This function will check that the resource has valid field and that
* the texture and mipmap bo object are big enough to cover this resource. * the texture and mipmap bo object are big enough to cover this resource.
*/ */
static inline int r600_check_texture_resource(struct radeon_cs_parser *p, u32 idx, static int r600_check_texture_resource(struct radeon_cs_parser *p, u32 idx,
struct radeon_bo *texture, struct radeon_bo *texture,
struct radeon_bo *mipmap, struct radeon_bo *mipmap,
u64 base_offset, u64 base_offset,