summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2020-05-24 08:34:30 -0400
committerMarge Bot <eric+marge@anholt.net>2020-06-02 20:47:49 +0000
commitce4575b3b5950041589cd2b96a8334146d8cec32 (patch)
tree6b7576e82392d8d912d83893fe59388962172bda
parentcac24bee6202d5bf1c16caa8174494747fa2d56c (diff)
radeonsi: remove unused leftover code for INDIRECT_BUFFER inside IBs
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5209>
-rw-r--r--src/gallium/drivers/radeonsi/si_pm4.c14
-rw-r--r--src/gallium/drivers/radeonsi/si_pm4.h3
2 files changed, 1 insertions, 16 deletions
diff --git a/src/gallium/drivers/radeonsi/si_pm4.c b/src/gallium/drivers/radeonsi/si_pm4.c
index 00db2ff15bf..a409b6efdd6 100644
--- a/src/gallium/drivers/radeonsi/si_pm4.c
+++ b/src/gallium/drivers/radeonsi/si_pm4.c
@@ -98,7 +98,6 @@ void si_pm4_clear_state(struct si_pm4_state *state)
{
for (int i = 0; i < state->nbo; ++i)
si_resource_reference(&state->bo[i], NULL);
- si_resource_reference(&state->indirect_buffer, NULL);
state->nbo = 0;
state->ndw = 0;
}
@@ -125,18 +124,7 @@ void si_pm4_emit(struct si_context *sctx, struct si_pm4_state *state)
state->bo_priority[i]);
}
- if (!state->indirect_buffer) {
- radeon_emit_array(cs, state->pm4, state->ndw);
- } else {
- struct si_resource *ib = state->indirect_buffer;
-
- radeon_add_to_buffer_list(sctx, sctx->gfx_cs, ib, RADEON_USAGE_READ, RADEON_PRIO_IB2);
-
- radeon_emit(cs, PKT3(PKT3_INDIRECT_BUFFER_CIK, 2, 0));
- radeon_emit(cs, ib->gpu_address);
- radeon_emit(cs, ib->gpu_address >> 32);
- radeon_emit(cs, (ib->b.b.width0 >> 2) & 0xfffff);
- }
+ radeon_emit_array(cs, state->pm4, state->ndw);
if (state->atom.emit)
state->atom.emit(sctx);
diff --git a/src/gallium/drivers/radeonsi/si_pm4.h b/src/gallium/drivers/radeonsi/si_pm4.h
index cde42ba1eca..34dc9be8472 100644
--- a/src/gallium/drivers/radeonsi/si_pm4.h
+++ b/src/gallium/drivers/radeonsi/si_pm4.h
@@ -41,9 +41,6 @@ struct si_atom {
};
struct si_pm4_state {
- /* optional indirect buffer */
- struct si_resource *indirect_buffer;
-
/* PKT3_SET_*_REG handling */
unsigned last_opcode;
unsigned last_reg;