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

vc4: Fix the name of qpu_waddr_ignores_ws().

Browse Source 
We're deciding about the WS bit, not PM.
This commit is contained in:
Eric Anholt
2014-12-16 11:29:15 -08:00
parent 54cc3be436
commit 8e18adea61
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/vc4/vc4_qpu.c
+5 -5
View File
@@ -261,7 +261,7 @@ qpu_num_sf_accesses(uint64_t inst)
}
static bool
qpu_waddr_ignores_pm(uint32_t waddr)
qpu_waddr_ignores_ws(uint32_t waddr)
{
switch(waddr) {
case QPU_W_ACC0:
@@ -394,11 +394,11 @@ qpu_merge_inst(uint64_t a, uint64_t b)
* destination for ADD/MUL) if one of the original instructions
* ignores it (probably because it's just writing to accumulators).
*/
if (qpu_waddr_ignores_pm(QPU_GET_FIELD(a, QPU_WADDR_ADD)) &&
qpu_waddr_ignores_pm(QPU_GET_FIELD(a, QPU_WADDR_MUL))) {
if (qpu_waddr_ignores_ws(QPU_GET_FIELD(a, QPU_WADDR_ADD)) &&
qpu_waddr_ignores_ws(QPU_GET_FIELD(a, QPU_WADDR_MUL))) {
merge = (merge & ~QPU_WS) | (b & QPU_WS);
} else if (qpu_waddr_ignores_pm(QPU_GET_FIELD(b, QPU_WADDR_ADD)) &&
qpu_waddr_ignores_pm(QPU_GET_FIELD(b, QPU_WADDR_MUL))) {
} else if (qpu_waddr_ignores_ws(QPU_GET_FIELD(b, QPU_WADDR_ADD)) &&
qpu_waddr_ignores_ws(QPU_GET_FIELD(b, QPU_WADDR_MUL))) {
merge = (merge & ~QPU_WS) | (a & QPU_WS);
} else {
if ((a & QPU_WS) != (b & QPU_WS))