panfrost: Fix tiler job injection (again)
authorBoris Brezillon <boris.brezillon@collabora.com>
Mon, 25 Jan 2021 10:38:14 +0000 (11:38 +0100)
committerBoris Brezillon <boris.brezillon@collabora.com>
Tue, 2 Feb 2021 08:04:15 +0000 (09:04 +0100)
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@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8808>

src/panfrost/lib/pan_scoreboard.c

index 27967fc..a12f823 100644 (file)
@@ -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;
         }