diff options
| author | Eric Anholt <eric@anholt.net> | 2015-01-12 09:16:26 +1300 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2015-01-15 22:19:25 +1300 |
| commit | 8f2fb68026d11feedb5d94cf17e719affe7b9423 (patch) | |
| tree | 3b9d7707ebbcec5538e5b8004473ec8a0eb0b338 /src/gallium/drivers/vc4/vc4_qpu.c | |
| parent | 5d5707707fb10712ba130c2dafb50e8fc92a2bcc (diff) | |
| download | external_mesa3d-8f2fb68026d11feedb5d94cf17e719affe7b9423.zip external_mesa3d-8f2fb68026d11feedb5d94cf17e719affe7b9423.tar.gz external_mesa3d-8f2fb68026d11feedb5d94cf17e719affe7b9423.tar.bz2 | |
vc4: Don't swap the raddr on instructions doing unpacks.
It would mean different unpacking behavior, since only the A file does
unpack (with PM==0).
Diffstat (limited to 'src/gallium/drivers/vc4/vc4_qpu.c')
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_qpu.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gallium/drivers/vc4/vc4_qpu.c b/src/gallium/drivers/vc4/vc4_qpu.c index 434e664..f67e3f8 100644 --- a/src/gallium/drivers/vc4/vc4_qpu.c +++ b/src/gallium/drivers/vc4/vc4_qpu.c @@ -337,6 +337,11 @@ try_swap_ra_file(uint64_t *merge, uint64_t *a, uint64_t *b) return false; } + if (!(*merge & QPU_PM) && + QPU_GET_FIELD(*merge, QPU_UNPACK) != QPU_UNPACK_NOP) { + return false; + } + if (raddr_b_b != QPU_R_NOP && raddr_b_b != raddr_a_a) return false; |