From bb5927c31f53a10f8e9c250863445ae1d86ef81a Mon Sep 17 00:00:00 2001
From: Jordan Justen <jordan.l.justen@intel.com>
Date: Thu, 19 Dec 2024 00:51:38 -0800
Subject: [PATCH] iris: Check that mem_fence_bo was created
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 8e8097245f6 ("iris: Emit STATE_SYSTEM_MEM_FENCE_ADDRESS")
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
(cherry picked from commit adfd7486c2916472860111bf37f79056cf4d43eb)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32730>
---
 .pick_status.json                      | 2 +-
 src/gallium/drivers/iris/iris_bufmgr.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 87ae80383a6..9e2c97c63dd 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4,7 +4,7 @@
         "description": "iris: Check that mem_fence_bo was created",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "8e8097245f6dc8f63893fd9a21bfc62a643ef43e",
         "notes": null
diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c
index c194de74618..fb59ea226e2 100644
--- a/src/gallium/drivers/iris/iris_bufmgr.c
+++ b/src/gallium/drivers/iris/iris_bufmgr.c
@@ -2484,8 +2484,8 @@ iris_bufmgr_create(struct intel_device_info *devinfo, int fd, bool bo_reuse)
    if (devinfo->verx10 >= 200) {
       bufmgr->mem_fence_bo = iris_bo_alloc(bufmgr, "mem_fence", 4096, 4096,
                                            IRIS_MEMZONE_OTHER, BO_ALLOC_SMEM);
-         if (!bufmgr->dummy_aux_bo)
-            goto error_alloc_bo;
+      if (!bufmgr->mem_fence_bo)
+         goto error_alloc_bo;
    }
 
    return bufmgr;