Mesa (staging/21.0): panfrost: Fix tiler job injection (again)

[GitLab Mirror]

Module: Mesa
Branch: staging/21.0
Commit: 199ee8d7de5b8a5078ddf20d408a6904125c06ab
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=199ee8d7de5b8a5078ddf20d408a6904125c06ab

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Mon Jan 25 11:38:14 2021 +0100

panfrost: Fix tiler job injection (again)

2f1947b39ca5 ("panfrost: Fix tiler job injection") had the tests
inverted: WRITE_VALUE jobs are only needed on Midgard, not Bifrost.

Cc: mesa-stable
Fixes: 2f1947b39ca5 ("panfrost: Fix tiler job injection")
Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8808>
(cherry picked from commit ec6c6f610c4e8fc69e3d86bef56cf64eeaccbd4a)

---

 .pick_status.json                 | 2 +-
 src/panfrost/lib/pan_scoreboard.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index b61dc1b6565..dedd142f984 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -841,7 +841,7 @@
         "description": "panfrost: Fix tiler job injection (again)",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "2f1947b39ca5426f1bb501d22cf3dcae9ae411ea"
     },
diff --git a/src/panfrost/lib/pan_scoreboard.c b/src/panfrost/lib/pan_scoreboard.c
index 27967fca536..a12f823151e 100644
--- a/src/panfrost/lib/pan_scoreboard.c
+++ b/src/panfrost/lib/pan_scoreboard.c
@@ -123,12 +123,12 @@ panfrost_add_job(
                  * job must depend on the write value job, whose index we
                  * reserve now */
 
-                if (is_bifrost && !scoreboard->write_value_index)
+                if (!is_bifrost && !scoreboard->write_value_index)
                         scoreboard->write_value_index = ++scoreboard->job_index;
 
                 if (scoreboard->tiler_dep && !inject)
                         global_dep = scoreboard->tiler_dep;
-                else if (is_bifrost)
+                else if (!is_bifrost)
                         global_dep = scoreboard->write_value_index;
         }