From baa173536429a0500689dd4ed5b122add60bb0d3 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Mon, 30 Jan 2023 20:12:05 -0600 Subject: [PATCH] nouveau/mme: Move the guts of mme_state_arr_to() into mme_tu104_builder.c Part-of: --- src/nouveau/mme/mme_builder.h | 4 +--- src/nouveau/mme/mme_tu104_builder.c | 10 +++++++++- src/nouveau/mme/mme_tu104_builder.h | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/nouveau/mme/mme_builder.h b/src/nouveau/mme/mme_builder.h index d1a1122c389..d80c4ca8fb7 100644 --- a/src/nouveau/mme/mme_builder.h +++ b/src/nouveau/mme/mme_builder.h @@ -32,7 +32,6 @@ enum mme_alu_op { MME_ALU_OP_SLE, MME_ALU_OP_SLEU, MME_ALU_OP_SEQ, - MME_ALU_OP_STATE, MME_ALU_OP_DREAD, MME_ALU_OP_DWRITE, }; @@ -315,8 +314,7 @@ static inline void mme_state_arr_to(struct mme_builder *b, struct mme_value dst, uint16_t state, struct mme_value index) { - assert(state % 4 == 0); - mme_alu_to(b, dst, MME_ALU_OP_STATE, mme_imm(state >> 2), index, 0); + mme_tu104_state_arr_to(b, dst, state, index); } static inline void diff --git a/src/nouveau/mme/mme_tu104_builder.c b/src/nouveau/mme/mme_tu104_builder.c index ff7f5fb5af9..f56a80bfb0c 100644 --- a/src/nouveau/mme/mme_tu104_builder.c +++ b/src/nouveau/mme/mme_tu104_builder.c @@ -308,7 +308,6 @@ mme_to_tu104_alu_op(enum mme_alu_op op) ALU_CASE(SLE) ALU_CASE(SLEU) ALU_CASE(SEQ) - ALU_CASE(STATE) ALU_CASE(DREAD) ALU_CASE(DWRITE) #undef ALU_CASE @@ -363,6 +362,15 @@ mme_tu104_merge_to(struct mme_builder *b, struct mme_value dst, build_alu_to(b, dst, MME_TU104_ALU_OP_MERGE, x, y, ctrl, false); } +void +mme_tu104_state_arr_to(struct mme_builder *b, struct mme_value dst, + uint16_t state, struct mme_value index) +{ + assert(state % 4 == 0); + build_alu_to(b, dst, MME_TU104_ALU_OP_STATE, + mme_imm(state >> 2), index, 0, false); +} + void mme_tu104_load_barrier(struct mme_builder *b) { diff --git a/src/nouveau/mme/mme_tu104_builder.h b/src/nouveau/mme/mme_tu104_builder.h index 7e94ee1659e..b5db7129bef 100644 --- a/src/nouveau/mme/mme_tu104_builder.h +++ b/src/nouveau/mme/mme_tu104_builder.h @@ -65,6 +65,9 @@ void mme_tu104_merge_to(struct mme_builder *b, struct mme_value dst, struct mme_value x, struct mme_value y, uint16_t dst_pos, uint16_t bits, uint16_t src_pos); +void mme_tu104_state_arr_to(struct mme_builder *b, struct mme_value dst, + uint16_t state, struct mme_value index); + void mme_tu104_load_barrier(struct mme_builder *b); void mme_tu104_load_to(struct mme_builder *b,