1 files changed, 16 insertions, 16 deletions

diff --git a/src/gallium/drivers/radeon/r600_perfcounter.c b/src/gallium/drivers/radeon/r600_perfcounter.c
index d88accc614a..711baef9817 100644
--- a/src/gallium/drivers/radeon/r600_perfcounter.c
+++ b/src/gallium/drivers/radeon/r600_perfcounter.c
@@ -23,7 +23,7 @@
 
 #include "util/u_memory.h"
 #include "r600_query.h"
-#include "r600_pipe_common.h"
+#include "radeonsi/si_pipe.h"
 #include "amd/common/sid.h"
 
 /* Max counters per HW block */
@@ -95,7 +95,7 @@ struct r600_query_pc {
 	struct r600_pc_group *groups;
 };
 
-static void r600_pc_query_destroy(struct r600_common_screen *rscreen,
+static void r600_pc_query_destroy(struct si_screen *sscreen,
 				  struct r600_query *rquery)
 {
 	struct r600_query_pc *query = (struct r600_query_pc *)rquery;
@@ -108,10 +108,10 @@ static void r600_pc_query_destroy(struct r600_common_screen *rscreen,
 
 	FREE(query->counters);
 
-	si_query_hw_destroy(rscreen, rquery);
+	si_query_hw_destroy(sscreen, rquery);
 }
 
-static bool r600_pc_query_prepare_buffer(struct r600_common_screen *screen,
+static bool r600_pc_query_prepare_buffer(struct si_screen *screen,
 					 struct r600_query_hw *hwquery,
 					 struct r600_resource *buffer)
 {
@@ -192,7 +192,7 @@ static void r600_pc_query_clear_result(struct r600_query_hw *hwquery,
 	memset(result, 0, sizeof(result->batch[0]) * query->num_counters);
 }
 
-static void r600_pc_query_add_result(struct r600_common_screen *rscreen,
+static void r600_pc_query_add_result(struct si_screen *sscreen,
 				     struct r600_query_hw *hwquery,
 				     void *buffer,
 				     union pipe_query_result *result)
@@ -226,7 +226,7 @@ static struct r600_query_hw_ops batch_query_hw_ops = {
 	.add_result = r600_pc_query_add_result,
 };
 
-static struct r600_pc_group *get_group_state(struct r600_common_screen *screen,
+static struct r600_pc_group *get_group_state(struct si_screen *screen,
 					     struct r600_query_pc *query,
 					     struct r600_perfcounter_block *block,
 					     unsigned sub_gid)
@@ -297,8 +297,8 @@ 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;
+	struct si_screen *screen =
+		(struct si_screen *)ctx->screen;
 	struct r600_perfcounters *pc = screen->perfcounters;
 	struct r600_perfcounter_block *block;
 	struct r600_pc_group *group;
@@ -423,7 +423,7 @@ error:
 	return NULL;
 }
 
-static bool r600_init_block_names(struct r600_common_screen *screen,
+static bool r600_init_block_names(struct si_screen *screen,
 				  struct r600_perfcounter_block *block)
 {
 	unsigned i, j, k;
@@ -507,7 +507,7 @@ static bool r600_init_block_names(struct r600_common_screen *screen,
 	return true;
 }
 
-int si_get_perfcounter_info(struct r600_common_screen *screen,
+int si_get_perfcounter_info(struct si_screen *screen,
 			    unsigned index,
 			    struct pipe_driver_query_info *info)
 {
@@ -549,7 +549,7 @@ int si_get_perfcounter_info(struct r600_common_screen *screen,
 	return 1;
 }
 
-int si_get_perfcounter_group_info(struct r600_common_screen *screen,
+int si_get_perfcounter_group_info(struct si_screen *screen,
 				  unsigned index,
 				  struct pipe_driver_query_group_info *info)
 {
@@ -576,10 +576,10 @@ int si_get_perfcounter_group_info(struct r600_common_screen *screen,
 	return 1;
 }
 
-void si_perfcounters_destroy(struct r600_common_screen *rscreen)
+void si_perfcounters_destroy(struct si_screen *sscreen)
 {
-	if (rscreen->perfcounters)
-		rscreen->perfcounters->cleanup(rscreen);
+	if (sscreen->perfcounters)
+		sscreen->perfcounters->cleanup(sscreen);
 }
 
 bool si_perfcounters_init(struct r600_perfcounters *pc,
@@ -595,7 +595,7 @@ bool si_perfcounters_init(struct r600_perfcounters *pc,
 	return true;
 }
 
-void si_perfcounters_add_block(struct r600_common_screen *rscreen,
+void si_perfcounters_add_block(struct si_screen *sscreen,
 			       struct r600_perfcounters *pc,
 			       const char *name, unsigned flags,
 			       unsigned counters, unsigned selectors,
@@ -624,7 +624,7 @@ void si_perfcounters_add_block(struct r600_common_screen *rscreen,
 	}
 
 	if (block->flags & R600_PC_BLOCK_SE_GROUPS)
-		block->num_groups *= rscreen->info.max_se;
+		block->num_groups *= sscreen->info.max_se;
 	if (block->flags & R600_PC_BLOCK_SHADER)
 		block->num_groups *= pc->num_shader_types;