Mesa (master): v3d: Fix check for TFU job completion in the simulator.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: b5adc744ba0265dedad8631b52d15fde3e5733db
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b5adc744ba0265dedad8631b52d15fde3e5733db

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Dec 18 16:17:26 2018 -0800

v3d: Fix check for TFU job completion in the simulator.

We're waiting for the jobs-completed count to increment (with wrapping),
not to reach its starting state.  This mostly ended up working out because
the next v3d_hw_tick() for a submit CL would end up doing the TFU
operation first, but it did fail when a blit was used for glReadPixels()
at the end of a test.

Fixes: ee0549ff9ab3 ("v3d: Add the V3D TFU submit interface to the simulator.")

---

 src/gallium/drivers/v3d/v3dx_simulator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/v3d/v3dx_simulator.c b/src/gallium/drivers/v3d/v3dx_simulator.c
index d1bca66b52..940b8f2ce3 100644
--- a/src/gallium/drivers/v3d/v3dx_simulator.c
+++ b/src/gallium/drivers/v3d/v3dx_simulator.c
@@ -120,7 +120,7 @@ v3dX(simulator_submit_tfu_ioctl)(struct v3d_hw *v3d,
 
         V3D_WRITE(V3D_TFU_ICFG, args->icfg);
 
-        while ((V3D_READ(V3D_TFU_CS) & V3D_TFU_CS_CVTCT_SET) != last_vtct) {
+        while ((V3D_READ(V3D_TFU_CS) & V3D_TFU_CS_CVTCT_SET) == last_vtct) {
                 v3d_hw_tick(v3d);
         }