diff options
author | Nicolai Hähnle <[email protected]> | 2015-12-13 16:46:21 -0500 |
---|---|---|
committer | Nicolai Hähnle <[email protected]> | 2015-12-15 11:23:40 -0500 |
commit | c8d9d289ff6f08a5fb058971546585552683546d (patch) | |
tree | 87b6481b2e6083944777342a539e44c60083f1b4 /src/gallium/drivers | |
parent | 149d04967637572cf8d0a83eaf9cc4f987313636 (diff) |
radeonsi: fix perfcounter selection for SI_PC_MULTI_BLOCK layouts
The incorrectly computed register count caused lockups.
Reviewed-by: Edward O'Callaghan <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r-- | src/gallium/drivers/radeonsi/si_perfcounter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_perfcounter.c b/src/gallium/drivers/radeonsi/si_perfcounter.c index a0ddff6c4e3..7ee1daee7bf 100644 --- a/src/gallium/drivers/radeonsi/si_perfcounter.c +++ b/src/gallium/drivers/radeonsi/si_perfcounter.c @@ -436,7 +436,7 @@ static void si_pc_emit_select(struct r600_common_context *ctx, dw = count + regs->num_prelude; if (count >= regs->num_multi) - count += regs->num_multi; + dw += regs->num_multi; radeon_set_uconfig_reg_seq(cs, regs->select0, dw); for (idx = 0; idx < regs->num_prelude; ++idx) radeon_emit(cs, 0); |