Mesa (master): pan/bi: Don't set the EOS flag if there's at least one successor

[GitLab Mirror]

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

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Mon Apr 19 17:49:22 2021 +0200

pan/bi: Don't set the EOS flag if there's at least one successor

The EOS (End Of Shader) is set if the first successor is NULL, but the
second successor should be checked too.

Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10369>

---

 src/panfrost/bifrost/bi_pack.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c
index 324a0e9762b..6302b6cd728 100644
--- a/src/panfrost/bifrost/bi_pack.c
+++ b/src/panfrost/bifrost/bi_pack.c
@@ -38,8 +38,8 @@ bi_pack_header(bi_clause *clause, bi_clause *next_1, bi_clause *next_2, bool tdd
 
         struct bifrost_header header = {
                 .flow_control =
-                        (next_1 == NULL) ? BIFROST_FLOW_END :
-                        clause->flow_control,
+                        (next_1 == NULL && next_2 == NULL) ?
+                        BIFROST_FLOW_END :  clause->flow_control,
                 .terminate_discarded_threads = tdd,
                 .next_clause_prefetch = clause->next_clause_prefetch && next_1,
                 .staging_barrier = clause->staging_barrier,