diff options
| author | Marek Olšák <[email protected]> | 2020-05-23 07:13:27 -0400 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-06-26 07:02:57 +0000 |
| commit | bbc0a2d51db0ae31979e039cfea643b6b3492c23 (patch) | |
| tree | 0c271c4c0dd6a4d6288dbd9ec8cb5e7bb2e4954c | |
| parent | c7680625c361a13d6a18d0b339b3a8e269962a2c (diff) | |
radeonsi: don't add the border color buffer into the init_config state
We might have to replace init_config for preemption.
Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5603>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_gfx_cs.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_gfx_cs.c b/src/gallium/drivers/radeonsi/si_gfx_cs.c index 347230012aa..ed7b8c12b26 100644 --- a/src/gallium/drivers/radeonsi/si_gfx_cs.c +++ b/src/gallium/drivers/radeonsi/si_gfx_cs.c @@ -403,6 +403,9 @@ void si_begin_new_gfx_cs(struct si_context *ctx) ctx->flags |= SI_CONTEXT_INV_ICACHE | SI_CONTEXT_INV_SCACHE | SI_CONTEXT_INV_VCACHE | SI_CONTEXT_INV_L2 | SI_CONTEXT_START_PIPELINE_STATS; + radeon_add_to_buffer_list(ctx, ctx->gfx_cs, ctx->border_color_buffer, + RADEON_USAGE_READ, RADEON_PRIO_BORDER_COLORS); + ctx->cs_shader_state.initialized = false; si_add_all_descriptors_to_bo_list(ctx); si_shader_pointers_mark_dirty(ctx); diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 485716678f4..95775b4207d 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -5348,7 +5348,6 @@ static void si_init_config(struct si_context *sctx) if (sctx->chip_class >= GFX7) { si_pm4_set_reg(pm4, R_028084_TA_BC_BASE_ADDR_HI, S_028084_ADDRESS(border_color_va >> 40)); } - si_pm4_add_bo(pm4, sctx->border_color_buffer, RADEON_USAGE_READ, RADEON_PRIO_BORDER_COLORS); if (sctx->chip_class >= GFX9) { si_pm4_set_reg(pm4, R_028C48_PA_SC_BINNER_CNTL_1, |