1 files changed, 22 insertions, 22 deletions

diff --git a/src/gallium/drivers/radeon/r600_perfcounter.c b/src/gallium/drivers/radeon/r600_perfcounter.c
index 48f609bcb41..13fd1e99e59 100644
--- a/src/gallium/drivers/radeon/r600_perfcounter.c
+++ b/src/gallium/drivers/radeon/r600_perfcounter.c
@@ -112,7 +112,7 @@ static void r600_pc_query_destroy(struct r600_common_screen *rscreen,
 
 	FREE(query->counters);
 
-	r600_query_hw_destroy(rscreen, rquery);
+	si_query_hw_destroy(rscreen, rquery);
 }
 
 static bool r600_pc_query_prepare_buffer(struct r600_common_screen *screen,
@@ -217,9 +217,9 @@ static void r600_pc_query_add_result(struct r600_common_screen *rscreen,
 
 static struct r600_query_ops batch_query_ops = {
 	.destroy = r600_pc_query_destroy,
-	.begin = r600_query_hw_begin,
-	.end = r600_query_hw_end,
-	.get_result = r600_query_hw_get_result
+	.begin = si_query_hw_begin,
+	.end = si_query_hw_end,
+	.get_result = si_query_hw_get_result
 };
 
 static struct r600_query_hw_ops batch_query_hw_ops = {
@@ -297,9 +297,9 @@ static struct r600_pc_group *get_group_state(struct r600_common_screen *screen,
 	return group;
 }
 
-struct pipe_query *r600_create_batch_query(struct pipe_context *ctx,
-					   unsigned num_queries,
-					   unsigned *query_types)
+struct pipe_query *si_create_batch_query(struct pipe_context *ctx,
+					 unsigned num_queries,
+					 unsigned *query_types)
 {
 	struct r600_common_screen *screen =
 		(struct r600_common_screen *)ctx->screen;
@@ -417,7 +417,7 @@ struct pipe_query *r600_create_batch_query(struct pipe_context *ctx,
 			counter->qwords *= block->num_instances;
 	}
 
-	if (!r600_query_hw_init(screen, &query->b))
+	if (!si_query_hw_init(screen, &query->b))
 		goto error;
 
 	return (struct pipe_query *)query;
@@ -511,9 +511,9 @@ static bool r600_init_block_names(struct r600_common_screen *screen,
 	return true;
 }
 
-int r600_get_perfcounter_info(struct r600_common_screen *screen,
-			      unsigned index,
-			      struct pipe_driver_query_info *info)
+int si_get_perfcounter_info(struct r600_common_screen *screen,
+			    unsigned index,
+			    struct pipe_driver_query_info *info)
 {
 	struct r600_perfcounters *pc = screen->perfcounters;
 	struct r600_perfcounter_block *block;
@@ -553,9 +553,9 @@ int r600_get_perfcounter_info(struct r600_common_screen *screen,
 	return 1;
 }
 
-int r600_get_perfcounter_group_info(struct r600_common_screen *screen,
-				    unsigned index,
-				    struct pipe_driver_query_group_info *info)
+int si_get_perfcounter_group_info(struct r600_common_screen *screen,
+				  unsigned index,
+				  struct pipe_driver_query_group_info *info)
 {
 	struct r600_perfcounters *pc = screen->perfcounters;
 	struct r600_perfcounter_block *block;
@@ -580,13 +580,13 @@ int r600_get_perfcounter_group_info(struct r600_common_screen *screen,
 	return 1;
 }
 
-void r600_perfcounters_destroy(struct r600_common_screen *rscreen)
+void si_perfcounters_destroy(struct r600_common_screen *rscreen)
 {
 	if (rscreen->perfcounters)
 		rscreen->perfcounters->cleanup(rscreen);
 }
 
-bool r600_perfcounters_init(struct r600_perfcounters *pc,
+bool si_perfcounters_init(struct r600_perfcounters *pc,
 			    unsigned num_blocks)
 {
 	pc->blocks = CALLOC(num_blocks, sizeof(struct r600_perfcounter_block));
@@ -599,11 +599,11 @@ bool r600_perfcounters_init(struct r600_perfcounters *pc,
 	return true;
 }
 
-void r600_perfcounters_add_block(struct r600_common_screen *rscreen,
-				 struct r600_perfcounters *pc,
-				 const char *name, unsigned flags,
-				 unsigned counters, unsigned selectors,
-				 unsigned instances, void *data)
+void si_perfcounters_add_block(struct r600_common_screen *rscreen,
+			       struct r600_perfcounters *pc,
+			       const char *name, unsigned flags,
+			       unsigned counters, unsigned selectors,
+			       unsigned instances, void *data)
 {
 	struct r600_perfcounter_block *block = &pc->blocks[pc->num_blocks];
 
@@ -636,7 +636,7 @@ void r600_perfcounters_add_block(struct r600_common_screen *rscreen,
 	pc->num_groups += block->num_groups;
 }
 
-void r600_perfcounters_do_destroy(struct r600_perfcounters *pc)
+void si_perfcounters_do_destroy(struct r600_perfcounters *pc)
 {
 	unsigned i;