From 862df0885aa04ef68319382fc2df27a7b68fc0dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20K=C3=B6nig?= Date: Thu, 2 Aug 2012 14:30:06 +0200 Subject: [PATCH] radeonsi: add support for PKT3 cmds to new state handling MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- src/gallium/drivers/radeonsi/radeonsi_pm4.c | 35 +++++++++++++++++++++-------- src/gallium/drivers/radeonsi/radeonsi_pm4.h | 4 ++++ 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/radeonsi/radeonsi_pm4.c b/src/gallium/drivers/radeonsi/radeonsi_pm4.c index 12facaf..da680dc 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pm4.c +++ b/src/gallium/drivers/radeonsi/radeonsi_pm4.c @@ -32,9 +32,30 @@ #define NUMBER_OF_STATES (sizeof(union si_state) / sizeof(struct si_pm4_state *)) +void si_pm4_cmd_begin(struct si_pm4_state *state, unsigned opcode) +{ + state->last_opcode = opcode; + state->last_pm4 = state->ndw++; +} + +void si_pm4_cmd_add(struct si_pm4_state *state, uint32_t dw) +{ + state->pm4[state->ndw++] = dw; +} + +void si_pm4_cmd_end(struct si_pm4_state *state, bool predicate) +{ + unsigned count; + count = state->ndw - state->last_pm4 - 2; + state->pm4[state->last_pm4] = PKT3(state->last_opcode, + count, predicate); + + assert(state->ndw <= SI_PM4_MAX_DW); +} + void si_pm4_set_reg(struct si_pm4_state *state, unsigned reg, uint32_t val) { - unsigned opcode, count; + unsigned opcode; if (reg >= SI_CONFIG_REG_OFFSET && reg <= SI_CONFIG_REG_END) { opcode = PKT3_SET_CONFIG_REG; @@ -55,17 +76,13 @@ void si_pm4_set_reg(struct si_pm4_state *state, unsigned reg, uint32_t val) reg >>= 2; if (opcode != state->last_opcode || reg != (state->last_reg + 1)) { - state->last_opcode = opcode; - state->last_pm4 = state->ndw++; - state->pm4[state->ndw++] = reg; + si_pm4_cmd_begin(state, opcode); + si_pm4_cmd_add(state, reg); } state->last_reg = reg; - count = state->ndw - state->last_pm4 - 1; - state->pm4[state->last_pm4] = PKT3(opcode, count, 0); - state->pm4[state->ndw++] = val; - - assert(state->ndw <= SI_PM4_MAX_DW); + si_pm4_cmd_add(state, val); + si_pm4_cmd_end(state, false); } void si_pm4_add_bo(struct si_pm4_state *state, diff --git a/src/gallium/drivers/radeonsi/radeonsi_pm4.h b/src/gallium/drivers/radeonsi/radeonsi_pm4.h index 18e5183..bbddfd0 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pm4.h +++ b/src/gallium/drivers/radeonsi/radeonsi_pm4.h @@ -55,6 +55,10 @@ struct si_pm4_state enum radeon_bo_usage bo_usage[SI_PM4_MAX_BO]; }; +void si_pm4_cmd_begin(struct si_pm4_state *state, unsigned opcode); +void si_pm4_cmd_add(struct si_pm4_state *state, uint32_t dw); +void si_pm4_cmd_end(struct si_pm4_state *state, bool predicate); + void si_pm4_set_reg(struct si_pm4_state *state, unsigned reg, uint32_t val); void si_pm4_add_bo(struct si_pm4_state *state, struct si_resource *bo, -- 2.7.4