Mesa (main): winsys/amdgpu: remove force_chaining parameter from cs_check_space
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Oct 19 17:44:52 UTC 2021
Module: Mesa
Branch: main
Commit: 6129db68bf81ac72e72e3e39e574fe8f227d0f0b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6129db68bf81ac72e72e3e39e574fe8f227d0f0b
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon Oct 18 00:27:15 2021 -0400
winsys/amdgpu: remove force_chaining parameter from cs_check_space
it's always false
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13400>
---
src/gallium/drivers/r300/r300_blit.c | 2 +-
src/gallium/drivers/r300/r300_render.c | 2 +-
src/gallium/drivers/r600/r600_hw_context.c | 2 +-
src/gallium/drivers/r600/r600_pipe_common.c | 2 +-
src/gallium/drivers/radeon/radeon_winsys.h | 4 +---
src/gallium/drivers/radeonsi/si_pipe.h | 2 +-
src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 22 ++++++++--------------
src/gallium/winsys/radeon/drm/radeon_drm_cs.c | 3 +--
8 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c
index 43e204f1198..2609ee30535 100644
--- a/src/gallium/drivers/r300/r300_blit.c
+++ b/src/gallium/drivers/r300/r300_blit.c
@@ -384,7 +384,7 @@ static void r300_clear(struct pipe_context* pipe,
r300_get_num_cs_end_dwords(r300);
/* Reserve CS space. */
- if (!r300->rws->cs_check_space(&r300->cs, dwords, false)) {
+ if (!r300->rws->cs_check_space(&r300->cs, dwords)) {
r300_flush(&r300->context, PIPE_FLUSH_ASYNC, NULL);
}
diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index 7d670892976..b39fca9bbd9 100644
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -216,7 +216,7 @@ static boolean r300_reserve_cs_dwords(struct r300_context *r300,
cs_dwords += r300_get_num_cs_end_dwords(r300);
/* Reserve requested CS space. */
- if (!r300->rws->cs_check_space(&r300->cs, cs_dwords, false)) {
+ if (!r300->rws->cs_check_space(&r300->cs, cs_dwords)) {
r300_flush(&r300->context, PIPE_FLUSH_ASYNC, NULL);
flushed = TRUE;
}
diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
index de032c6dcfe..c3aef0f4be6 100644
--- a/src/gallium/drivers/r600/r600_hw_context.c
+++ b/src/gallium/drivers/r600/r600_hw_context.c
@@ -84,7 +84,7 @@ void r600_need_cs_space(struct r600_context *ctx, unsigned num_dw,
num_dw += 10;
/* Flush if there's not enough space. */
- if (!ctx->b.ws->cs_check_space(&ctx->b.gfx.cs, num_dw, false)) {
+ if (!ctx->b.ws->cs_check_space(&ctx->b.gfx.cs, num_dw)) {
ctx->b.gfx.flush(ctx, PIPE_FLUSH_ASYNC, NULL);
}
}
diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c
index a6af8149dc1..c7c77eacc37 100644
--- a/src/gallium/drivers/r600/r600_pipe_common.c
+++ b/src/gallium/drivers/r600/r600_pipe_common.c
@@ -263,7 +263,7 @@ void r600_need_dma_space(struct r600_common_context *ctx, unsigned num_dw,
* engine busy while uploads are being submitted.
*/
num_dw++; /* for emit_wait_idle below */
- if (!ctx->ws->cs_check_space(&ctx->dma.cs, num_dw, false) ||
+ if (!ctx->ws->cs_check_space(&ctx->dma.cs, num_dw) ||
ctx->dma.cs.used_vram_kb + ctx->dma.cs.used_gart_kb > 64 * 1024 ||
!radeon_cs_memory_below_limit(ctx->screen, &ctx->dma.cs, vram, gtt)) {
ctx->dma.flush(ctx, PIPE_FLUSH_ASYNC, NULL);
diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h
index 7555f35b7ac..55c6b11602a 100644
--- a/src/gallium/drivers/radeon/radeon_winsys.h
+++ b/src/gallium/drivers/radeon/radeon_winsys.h
@@ -569,11 +569,9 @@ struct radeon_winsys {
*
* \param cs A command stream.
* \param dw Number of CS dwords requested by the caller.
- * \param force_chaining Chain the IB into a new buffer now to discard
- * the CP prefetch cache (to emulate PKT3_REWIND)
* \return true if there is enough space
*/
- bool (*cs_check_space)(struct radeon_cmdbuf *cs, unsigned dw, bool force_chaining);
+ bool (*cs_check_space)(struct radeon_cmdbuf *cs, unsigned dw);
/**
* Return the buffer list.
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index a66ceecacdf..a128983e2c4 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -1923,7 +1923,7 @@ static inline void si_need_gfx_cs_space(struct si_context *ctx, unsigned num_dra
ctx->memory_usage_kb = 0;
if (radeon_cs_memory_below_limit(ctx->screen, &ctx->gfx_cs, kb) &&
- ctx->ws->cs_check_space(cs, si_get_minimum_num_gfx_cs_dwords(ctx, num_draws), false))
+ ctx->ws->cs_check_space(cs, si_get_minimum_num_gfx_cs_dwords(ctx, num_draws)))
return;
si_flush_gfx_cs(ctx, RADEON_FLUSH_ASYNC_START_NEXT_GFX_IB_NOW, NULL);
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
index 6452d2ba4a8..a60c1225b14 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
@@ -1070,8 +1070,7 @@ static bool amdgpu_cs_validate(struct radeon_cmdbuf *rcs)
return true;
}
-static bool amdgpu_cs_check_space(struct radeon_cmdbuf *rcs, unsigned dw,
- bool force_chaining)
+static bool amdgpu_cs_check_space(struct radeon_cmdbuf *rcs, unsigned dw)
{
struct amdgpu_cs *cs = amdgpu_cs(rcs);
struct amdgpu_ib *ib = &cs->main;
@@ -1085,23 +1084,18 @@ static bool amdgpu_cs_check_space(struct radeon_cmdbuf *rcs, unsigned dw,
ib->max_check_space_size = MAX2(ib->max_check_space_size,
safe_byte_size);
- /* If force_chaining is true, we can't return. We have to chain. */
- if (!force_chaining) {
- unsigned requested_size = rcs->prev_dw + rcs->current.cdw + dw;
+ unsigned requested_size = rcs->prev_dw + rcs->current.cdw + dw;
- if (requested_size > IB_MAX_SUBMIT_DWORDS)
- return false;
+ if (requested_size > IB_MAX_SUBMIT_DWORDS)
+ return false;
- ib->max_ib_size = MAX2(ib->max_ib_size, requested_size);
+ ib->max_ib_size = MAX2(ib->max_ib_size, requested_size);
- if (rcs->current.max_dw - rcs->current.cdw >= dw)
- return true;
- }
+ if (rcs->current.max_dw - rcs->current.cdw >= dw)
+ return true;
- if (!cs->has_chaining) {
- assert(!force_chaining);
+ if (!cs->has_chaining)
return false;
- }
/* Allocate a new chunk */
if (rcs->num_prev >= rcs->max_prev) {
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
index c5e92ec678b..0e37d1c732a 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
@@ -452,8 +452,7 @@ static bool radeon_drm_cs_validate(struct radeon_cmdbuf *rcs)
return status;
}
-static bool radeon_drm_cs_check_space(struct radeon_cmdbuf *rcs, unsigned dw,
- bool force_chaining)
+static bool radeon_drm_cs_check_space(struct radeon_cmdbuf *rcs, unsigned dw)
{
assert(rcs->current.cdw <= rcs->current.max_dw);
return rcs->current.max_dw - rcs->current.cdw >= dw;
More information about the mesa-commit
mailing list