fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 13:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panfrost: Fix tiler job injection (again)

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

Cc: mesa-stable
Fixes: 2f1947b39c ("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>
(cherry picked from commit ec6c6f610c)
This commit is contained in:
Boris Brezillon 2021-01-25 11:38:14 +01:00 • committed by Dylan Baker
parent 06faacb8b1
commit 98e928ea6a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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"
},

4
src/panfrost/lib/pan_scoreboard.c
View 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;
}