fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-28 14:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

freedreno/registers: Rename NCRB

Browse source 
Signed-off-by: Rob Clark <rob.clark@oss.qualcomm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36589>
This commit is contained in:
Rob Clark 2025-07-19 06:46:23 -07:00 • committed by Marge Bot
parent fc61827688
commit ac5b9f7cd0
4 changed files with 10 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/freedreno/decode/cffdec.c
View file

@ -2900,28 +2900,8 @@ cp_context_reg_bunch(uint32_t *dwords, uint32_t sizedwords, int level)
summary = saved_summary;
}
/* Looks similar to CP_CONTEXT_REG_BUNCH, but not quite the same...
* discarding first two dwords??
*
* CP_CONTEXT_REG_BUNCH:
* 0221: 9c1ff606 (rep)(xmov3)mov $usraddr, $data
* ; mov $data, $data
* ; mov $usraddr, $data
* ; mov $data, $data
* 0222: d8000000 waitin
* 0223: 981f0806 mov $01, $data
*
* CP_UNK5D:
* 0224: 981f0006 mov $00, $data
* 0225: 981f0006 mov $00, $data
* 0226: 9c1ff206 (rep)(xmov1)mov $usraddr, $data
* ; mov $data, $data
* 0227: d8000000 waitin
* 0228: 981f0806 mov $01, $data
*
*/
static void
cp_context_reg_bunch2(uint32_t *dwords, uint32_t sizedwords, int level)
cp_non_context_reg_bunch(uint32_t *dwords, uint32_t sizedwords, int level)
{
dwords += 2;
sizedwords -= 2;
@ -3033,7 +3013,7 @@ static const struct type3_op {
/* for a7xx */
CP(THREAD_CONTROL, cp_set_thread_control),
CP(CONTEXT_REG_BUNCH2, cp_context_reg_bunch2),
CP(NON_CONTEXT_REG_BUNCH, cp_non_context_reg_bunch),
CP(EVENT_WRITE7, cp_event_write),
};

8
src/freedreno/decode/rddecompiler.c
View file

@ -415,16 +415,16 @@ decompile_commands(uint32_t *dwords, uint32_t sizedwords, int level, uint32_t *c
"CP_SET_DRAW_STATE", level);
}
}
} else if (val == CP_CONTEXT_REG_BUNCH || val == CP_CONTEXT_REG_BUNCH2) {
} else if (val == CP_CONTEXT_REG_BUNCH || val == CP_NON_CONTEXT_REG_BUNCH) {
uint32_t *dw = dwords + 1;
uint32_t cnt = count - 1;
if (val == CP_CONTEXT_REG_BUNCH2) {
if (val == CP_NON_CONTEXT_REG_BUNCH) {
if (options.no_reg_bunch) {
printlvl(level, "// CP_CONTEXT_REG_BUNCH2\n");
printlvl(level, "// CP_NON_CONTEXT_REG_BUNCH\n");
printlvl(level, "{\n");
} else {
printlvl(level, "pkt7(cs, %s, %u);\n", "CP_CONTEXT_REG_BUNCH2", cnt);
printlvl(level, "pkt7(cs, %s, %u);\n", "CP_NON_CONTEXT_REG_BUNCH", cnt);
printlvl(level, "{\n");
printlvl(level + 1, "pkt(cs, 0x%x);\n", dw[0]);
printlvl(level + 1, "pkt(cs, 0x%x);\n", dw[1]);

3
src/freedreno/registers/adreno/adreno_pm4.xml
View file

@ -640,8 +640,7 @@ xsi:schemaLocation="https://gitlab.freedesktop.org/freedreno/ rules-fd.xsd">
<value name="CP_BV_BR_COUNT_OPS" value="0x1b" variants="A7XX-"/>
<doc> Clears, adds to local, or adds to global timestamp </doc>
<value name="CP_MODIFY_TIMESTAMP" value="0x1c" variants="A7XX-"/>
<!-- similar to CP_CONTEXT_REG_BUNCH, but discards first two dwords?? -->
<value name="CP_CONTEXT_REG_BUNCH2" value="0x5d" variants="A7XX-"/>
<value name="CP_NON_CONTEXT_REG_BUNCH" value="0x5d" variants="A7XX-"/>
<doc>
Write to a scratch memory that is read by CP_REG_TEST with
SOURCE_SCRATCH_MEM set. It's not the same scratch as scratch registers.

6
src/freedreno/tests/reference/afuc_test_a7xx.asm
View file

@ -196,7 +196,6 @@ CP_COND_EXEC:
CP_COND_REG_EXEC:
CP_COND_WRITE5:
CP_CONTEXT_REG_BUNCH:
CP_CONTEXT_REG_BUNCH2:
CP_CONTEXT_SWITCH_YIELD:
CP_CONTEXT_UPDATE:
CP_DRAW_AUTO:
@ -232,6 +231,7 @@ CP_MEM_TO_REG:
CP_MEM_TO_SCRATCH_MEM:
CP_MEM_WRITE_CNTR:
CP_MODIFY_TIMESTAMP:
CP_NON_CONTEXT_REG_BUNCH:
CP_NOP:
CP_RECORD_PFP_TIMESTAMP:
CP_REG_TEST:
@ -357,7 +357,6 @@ CP_COND_EXEC:
CP_COND_REG_EXEC:
CP_COND_WRITE5:
CP_CONTEXT_REG_BUNCH:
CP_CONTEXT_REG_BUNCH2:
CP_CONTEXT_SWITCH_YIELD:
CP_CONTEXT_UPDATE:
CP_DRAW_AUTO:
@ -397,6 +396,7 @@ CP_MEM_WRITE:
CP_MEM_WRITE_CNTR:
CP_ME_INIT:
CP_MODIFY_TIMESTAMP:
CP_NON_CONTEXT_REG_BUNCH:
CP_NOP:
CP_RECORD_PFP_TIMESTAMP:
CP_REG_RMW:
@ -520,7 +520,6 @@ CP_COND_EXEC:
CP_COND_REG_EXEC:
CP_COND_WRITE5:
CP_CONTEXT_REG_BUNCH:
CP_CONTEXT_REG_BUNCH2:
CP_CONTEXT_SWITCH_YIELD:
CP_CONTEXT_UPDATE:
CP_DRAW_AUTO:
@ -560,6 +559,7 @@ CP_MEM_WRITE:
CP_MEM_WRITE_CNTR:
CP_ME_INIT:
CP_MODIFY_TIMESTAMP:
CP_NON_CONTEXT_REG_BUNCH:
CP_NOP:
CP_RECORD_PFP_TIMESTAMP:
CP_REG_RMW: