Mesa (staging/21.2): panfrost: Fix pan_blitter_emit_bifrost_blend()

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 8d018d2dba19566c79466bd5674489f38ac23f8c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d018d2dba19566c79466bd5674489f38ac23f8c

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Fri Aug  6 14:53:33 2021 +0200

panfrost: Fix pan_blitter_emit_bifrost_blend()

If we return inside a pan_pack() the descriptor packing doesn't happen.

Cc: mesa-stable
Fixes: 8ba2f9f69858 ("panfrost: Create a blitter library to replace the existing preload helpers")
Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12239>
(cherry picked from commit 06fc6e46f039712aa03e1b0c6d14a5159b9c50b0)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 3eb8ef0cd55..7ad71c7db1d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -148,7 +148,7 @@
         "description": "panfrost: Fix pan_blitter_emit_bifrost_blend()",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "8ba2f9f698584d20830ef31bbc2fb8a6635c8314"
     },
diff --git a/src/panfrost/lib/pan_blitter.c b/src/panfrost/lib/pan_blitter.c
index 74c8c015d0b..b1ec8855128 100644
--- a/src/panfrost/lib/pan_blitter.c
+++ b/src/panfrost/lib/pan_blitter.c
@@ -228,7 +228,7 @@ pan_blitter_emit_bifrost_blend(const struct panfrost_device *dev,
                 if (!iview) {
                         cfg.enable = false;
                         cfg.bifrost.internal.mode = MALI_BIFROST_BLEND_MODE_OFF;
-                        return;
+                        continue;
                 }
 
                 nir_alu_type type = blit_shader->key.surfaces[rt].type;