Mesa (staging/22.0): iris: don't synchronize BO for batch decoding

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 323ee0c7d8470ec17d9b3a6ee4ceb9f82e55837e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=323ee0c7d8470ec17d9b3a6ee4ceb9f82e55837e

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Wed Mar 23 11:10:08 2022 +0200

iris: don't synchronize BO for batch decoding

We don't need to go to the kernel to synchronize the BO we want to
decode with INTEL_DEBUG=bat, mostly because we'll decode what was
written by the driver in the batch.

This also works around an issue in the simulation environment.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Fixes: 9ac81f189050 ("iris: decoder fixes")
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15517>
(cherry picked from commit a55cc061fd08a5d7a02e27accdeca98193fa2468)

---

 .pick_status.json                     | 2 +-
 src/gallium/drivers/iris/iris_batch.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index b586c5b132c..8346e50922e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1908,7 +1908,7 @@
         "description": "iris: don't synchronize BO for batch decoding",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 5,
+        "resolution": 1,
         "because_sha": "9ac81f189050663335999a04336f14c45579dcb7"
     },
     {
diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
index 1364f5fdb07..98f956e875f 100644
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -143,7 +143,7 @@ decode_get_bo(void *v_batch, bool ppgtt, uint64_t address)
          return (struct intel_batch_decode_bo) {
             .addr = bo_address,
             .size = bo->size,
-            .map = iris_bo_map(batch->dbg, bo, MAP_READ),
+            .map = iris_bo_map(batch->dbg, bo, MAP_READ | MAP_ASYNC),
          };
       }
    }