From fa09388704fd413c0d53397b46293af03d73ddb6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 1 Apr 2018 14:17:23 -0400 Subject: [PATCH] radeonsi: rename si_need_cs_space -> si_need_gfx_cs_space Acked-by: Timothy Arceri --- src/gallium/drivers/radeon/r600_query.c | 6 +++--- src/gallium/drivers/radeonsi/si_compute.c | 2 +- src/gallium/drivers/radeonsi/si_cp_dma.c | 2 +- src/gallium/drivers/radeonsi/si_hw_context.c | 2 +- src/gallium/drivers/radeonsi/si_pipe.h | 2 +- src/gallium/drivers/radeonsi/si_state_draw.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c index aa23aac0f7e..c7b2d946a91 100644 --- a/src/gallium/drivers/radeon/r600_query.c +++ b/src/gallium/drivers/radeon/r600_query.c @@ -801,7 +801,7 @@ static void r600_query_hw_emit_start(struct r600_common_context *ctx, r600_update_occlusion_query_state(ctx, query->b.type, 1); si_update_prims_generated_query_state((void*)ctx, query->b.type, 1); - si_need_cs_space((struct si_context*)ctx); + si_need_gfx_cs_space((struct si_context*)ctx); /* Get a new query buffer if needed. */ if (query->buffer.results_end + query->result_size > query->buffer.buf->b.b.width0) { @@ -898,7 +898,7 @@ static void r600_query_hw_emit_stop(struct r600_common_context *ctx, /* The queries which need begin already called this in begin_query. */ if (query->flags & R600_QUERY_HW_FLAG_NO_START) - si_need_cs_space((struct si_context*)ctx); + si_need_gfx_cs_space((struct si_context*)ctx); /* emit end query */ va = query->buffer.buf->gpu_address + query->buffer.results_end; @@ -1844,7 +1844,7 @@ void si_resume_queries(struct r600_common_context *ctx) assert(ctx->num_cs_dw_queries_suspend == 0); /* Check CS space here. Resuming must not be interrupted by flushes. */ - si_need_cs_space((struct si_context*)ctx); + si_need_gfx_cs_space((struct si_context*)ctx); LIST_FOR_EACH_ENTRY(query, &ctx->active_queries, list) { r600_query_hw_emit_start(ctx, query); diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index 46873ccce77..e15d6f92921 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -849,7 +849,7 @@ static void si_launch_grid( } } - si_need_cs_space(sctx); + si_need_gfx_cs_space(sctx); if (!sctx->cs_shader_state.initialized) si_initialize_compute(sctx); diff --git a/src/gallium/drivers/radeonsi/si_cp_dma.c b/src/gallium/drivers/radeonsi/si_cp_dma.c index 15bd305a350..cd88d38cced 100644 --- a/src/gallium/drivers/radeonsi/si_cp_dma.c +++ b/src/gallium/drivers/radeonsi/si_cp_dma.c @@ -171,7 +171,7 @@ static void si_cp_dma_prepare(struct si_context *sctx, struct pipe_resource *dst } if (!(user_flags & SI_CPDMA_SKIP_CHECK_CS_SPACE)) - si_need_cs_space(sctx); + si_need_gfx_cs_space(sctx); /* This must be done after need_cs_space. */ if (!(user_flags & SI_CPDMA_SKIP_BO_LIST_UPDATE)) { diff --git a/src/gallium/drivers/radeonsi/si_hw_context.c b/src/gallium/drivers/radeonsi/si_hw_context.c index eb9e16c229f..a97f2ecfc1f 100644 --- a/src/gallium/drivers/radeonsi/si_hw_context.c +++ b/src/gallium/drivers/radeonsi/si_hw_context.c @@ -34,7 +34,7 @@ void si_destroy_saved_cs(struct si_saved_cs *scs) } /* initialize */ -void si_need_cs_space(struct si_context *ctx) +void si_need_gfx_cs_space(struct si_context *ctx) { struct radeon_winsys_cs *cs = ctx->b.gfx.cs; diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index 098d1e4f909..2c40866d90f 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -732,7 +732,7 @@ void si_destroy_saved_cs(struct si_saved_cs *scs); void si_flush_gfx_cs(void *context, unsigned flags, struct pipe_fence_handle **fence); void si_begin_new_cs(struct si_context *ctx); -void si_need_cs_space(struct si_context *ctx); +void si_need_gfx_cs_space(struct si_context *ctx); /* si_compute.c */ void si_init_compute_functions(struct si_context *sctx); diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index ad470fd9aec..8779a940331 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -1404,7 +1404,7 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info) } } - si_need_cs_space(sctx); + si_need_gfx_cs_space(sctx); /* Since we've called r600_context_add_resource_size for vertex buffers, * this must be called after si_need_cs_space, because we must let -- 2.30.2