r600g: inline some of the winsys r600_get functions

3 files changed, 6 insertions, 31 deletions

diff --git a/src/gallium/winsys/r600/drm/evergreen_hw_context.c b/src/gallium/winsys/r600/drm/evergreen_hw_context.c
index 3417eb39192..b35812686be 100644
--- a/src/gallium/winsys/r600/drm/evergreen_hw_context.c
+++ b/src/gallium/winsys/r600/drm/evergreen_hw_context.c
@@ -917,7 +917,7 @@ int evergreen_context_init(struct r600_context *ctx, struct radeon *radeon)
 	}
 
 	/* add blocks */
-	if (r600_get_family(radeon) == CHIP_CAYMAN) 
+	if (radeon->family == CHIP_CAYMAN)
 		r = r600_context_add_block(ctx, cayman_config_reg_list,
 					   Elements(cayman_config_reg_list), PKT3_SET_CONFIG_REG, EVERGREEN_CONFIG_REG_OFFSET);
 	else
@@ -925,7 +925,7 @@ int evergreen_context_init(struct r600_context *ctx, struct radeon *radeon)
 					   Elements(evergreen_config_reg_list), PKT3_SET_CONFIG_REG, EVERGREEN_CONFIG_REG_OFFSET);
 	if (r)
 		goto out_err;
-	if (r600_get_family(radeon) == CHIP_CAYMAN) 
+	if (radeon->family == CHIP_CAYMAN)
 		r = r600_context_add_block(ctx, cayman_context_reg_list,
 					   Elements(cayman_context_reg_list), PKT3_SET_CONTEXT_REG, EVERGREEN_CONTEXT_REG_OFFSET);
 	else
diff --git a/src/gallium/winsys/r600/drm/r600_drm.c b/src/gallium/winsys/r600/drm/r600_drm.c
index 8f1fc722f6d..33fc6b7629a 100644
--- a/src/gallium/winsys/r600/drm/r600_drm.c
+++ b/src/gallium/winsys/r600/drm/r600_drm.c
@@ -41,31 +41,6 @@ enum chip_class r600_get_family_class(struct radeon *radeon)
 	return radeon->chip_class;
 }
 
-unsigned r600_get_clock_crystal_freq(struct radeon *radeon)
-{
-	return radeon->info.r600_clock_crystal_freq;
-}
-
-unsigned r600_get_num_backends(struct radeon *radeon)
-{
-	return radeon->info.r600_num_backends;
-}
-
-unsigned r600_get_num_tile_pipes(struct radeon *radeon)
-{
-	return radeon->info.r600_num_tile_pipes;
-}
-
-unsigned r600_get_backend_map(struct radeon *radeon)
-{
-	return radeon->info.r600_backend_map;
-}
-
-unsigned r600_get_minor_version(struct radeon *radeon)
-{
-	return radeon->info.drm_minor;
-}
-
 static unsigned radeon_family_from_device(unsigned device)
 {
 	switch (device) {
diff --git a/src/gallium/winsys/r600/drm/r600_hw_context.c b/src/gallium/winsys/r600/drm/r600_hw_context.c
index 5d415ae6348..848e768c38c 100644
--- a/src/gallium/winsys/r600/drm/r600_hw_context.c
+++ b/src/gallium/winsys/r600/drm/r600_hw_context.c
@@ -35,13 +35,13 @@ void r600_get_backend_mask(struct r600_context *ctx)
 {
 	struct r600_bo * buffer;
 	u32 * results;
-	unsigned num_backends = r600_get_num_backends(ctx->radeon);
+	unsigned num_backends = ctx->radeon->info.r600_num_backends;
 	unsigned i, mask = 0;
 
 	/* if backend_map query is supported by the kernel */
 	if (ctx->radeon->info.r600_backend_map_valid) {
-		unsigned num_tile_pipes = r600_get_num_tile_pipes(ctx->radeon);
-		unsigned backend_map = r600_get_backend_map(ctx->radeon);
+		unsigned num_tile_pipes = ctx->radeon->info.r600_num_tile_pipes;
+		unsigned backend_map = ctx->radeon->info.r600_backend_map;
 		unsigned item_width, item_mask;
 
 		if (ctx->radeon->chip_class >= EVERGREEN) {
@@ -1811,7 +1811,7 @@ boolean r600_context_query_result(struct r600_context *ctx,
 	if (!r600_query_result(ctx, query, wait))
 		return FALSE;
 	if (query->type == PIPE_QUERY_TIME_ELAPSED)
-		*result = (1000000*query->result)/r600_get_clock_crystal_freq(ctx->radeon);
+		*result = (1000000 * query->result) / ctx->radeon->info.r600_clock_crystal_freq;
 	else
 		*result = query->result;
 	query->result = 0;