From 258eae939f5e99f9f4c9c889283da6ca586d73e8 Mon Sep 17 00:00:00 2001
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date: Thu, 18 Sep 2025 12:41:49 -0700
Subject: [PATCH] iris/xe: move error checking to inside the devinfo->no_hw
 case
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This check is for the command submission return.

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Rohan Garg <rohan.garg@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37559>
---
 src/gallium/drivers/iris/xe/iris_kmd_backend.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/iris/xe/iris_kmd_backend.c b/src/gallium/drivers/iris/xe/iris_kmd_backend.c
index a939e558425..fc228cfd9b1 100644
--- a/src/gallium/drivers/iris/xe/iris_kmd_backend.c
+++ b/src/gallium/drivers/iris/xe/iris_kmd_backend.c
@@ -408,12 +408,13 @@ xe_batch_submit(struct iris_batch *batch)
       .syncs = (uintptr_t)syncs,
       .num_syncs = sync_len,
    };
-   if (!batch->screen->devinfo->no_hw)
+   if (!batch->screen->devinfo->no_hw) {
       ret = intel_ioctl(iris_bufmgr_get_fd(bufmgr), DRM_IOCTL_XE_EXEC, &exec);
 
-   if (ret) {
-      ret = -errno;
-      goto error_exec;
+      if (ret) {
+         ret = -errno;
+         goto error_exec;
+      }
    }
 
    if (!iris_implicit_sync_export(batch, &implicit_sync))