radeonsi: remove r600_pipe_common::set_atom_dirty

[mesa.git] / src / gallium / drivers / radeon / r600_perfcounter.c

diff --git a/src/gallium/drivers/radeon/r600_perfcounter.c b/src/gallium/drivers/radeon/r600_perfcounter.c
index 6c68dc4695d170a01eca36cc7c21e588d48f4008..711baef98175b77a0ed52b81a88e2a0ddc52da43 100644 (file)
--- a/src/gallium/drivers/radeon/r600_perfcounter.c
+++ b/src/gallium/drivers/radeon/r600_perfcounter.c
@@ -19,15 +19,11 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * Authors:
- *  Nicolai Hähnle <nicolai.haehnle@amd.com>
- *
  */
 
 #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 */
@@ -99,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;
@@ -112,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)
 {
@@ -196,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)
@@ -230,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)
@@ -301,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;
@@ -427,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;
@@ -511,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)
 {
@@ -553,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)
 {
@@ -580,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,
@@ -599,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,
@@ -628,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;