AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vc4: Don't let pairing happen with badly mismatched unpack flags.

Browse Source 
No difference on shader-db, but prevents definite regressions in the
blending changes.
This commit is contained in:
Eric Anholt
2015-01-11 19:31:59 +13:00
parent 3820866e40
commit 5d5707707f
1 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/vc4/vc4_qpu.c
+39
View File
@@ -403,6 +403,15 @@ writes_a_file(uint64_t inst)
return QPU_GET_FIELD(inst, QPU_WADDR_MUL) < 32;
}
static bool
reads_r4(uint64_t inst)
{
return (QPU_GET_FIELD(inst, QPU_ADD_A) == QPU_MUX_R4 ||
QPU_GET_FIELD(inst, QPU_ADD_B) == QPU_MUX_R4 ||
QPU_GET_FIELD(inst, QPU_MUL_A) == QPU_MUX_R4 ||
QPU_GET_FIELD(inst, QPU_MUL_B) == QPU_MUX_R4);
}
uint64_t
qpu_merge_inst(uint64_t a, uint64_t b)
{
@@ -509,6 +518,36 @@ qpu_merge_inst(uint64_t a, uint64_t b)
return 0;
}
/* unpacking: Make sure that non-NOP unpacks agree, then deal with
* special-case failing of adding a non-NOP unpack to something with a
* NOP unpack.
*/
if (!merge_fields(&merge, a, b, QPU_UNPACK_MASK, 0))
return 0;
bool new_a_unpack = (QPU_GET_FIELD(a, QPU_UNPACK) !=
QPU_GET_FIELD(merge, QPU_UNPACK));
bool new_b_unpack = (QPU_GET_FIELD(b, QPU_UNPACK) !=
QPU_GET_FIELD(merge, QPU_UNPACK));
if (!(merge & QPU_PM)) {
/* Make sure we're not going to be putting a new
* a-file packing on either half.
*/
if (new_a_unpack && QPU_GET_FIELD(a, QPU_RADDR_A) != QPU_R_NOP)
return 0;
if (new_b_unpack && QPU_GET_FIELD(b, QPU_RADDR_A) != QPU_R_NOP)
return 0;
} else {
/* Make sure we're not going to be putting new r4 unpack on
* either half.
*/
if (new_a_unpack && reads_r4(a))
return 0;
if (new_b_unpack && reads_r4(b))
return 0;
}
if (ok)
return merge;
else