drm/xe/ct: fix xa_store() error checking

Looks like we are meant to use xa_err() to extract the error encoded in
the ptr.

Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Badal Nilawar <badal.nilawar@intel.com>
Cc: <stable@vger.kernel.org> # v6.8+
Reviewed-by: Badal Nilawar <badal.nilawar@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241001084346.98516-6-matthew.auld@intel.com
(cherry picked from commit 1aa4b7864707886fa40d959483591f3d3937fa28)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c
index 79eb8e60137ba76c606f7a38c3e870ba66e3a6f8..d16eb9ab49fbb8ff8c190495e344f4b7871ac825 100644 (file)
--- a/drivers/gpu/drm/xe/xe_guc_ct.c
+++ b/drivers/gpu/drm/xe/xe_guc_ct.c
@@ -667,16 +667,12 @@ static int __guc_ct_send_locked(struct xe_guc_ct *ct, const u32 *action,
                num_g2h = 1;
 
                if (g2h_fence_needs_alloc(g2h_fence)) {
-                       void *ptr;
-
                        g2h_fence->seqno = next_ct_seqno(ct, true);
-                       ptr = xa_store(&ct->fence_lookup,
-                                      g2h_fence->seqno,
-                                      g2h_fence, GFP_ATOMIC);
-                       if (IS_ERR(ptr)) {
-                               ret = PTR_ERR(ptr);
+                       ret = xa_err(xa_store(&ct->fence_lookup,
+                                             g2h_fence->seqno, g2h_fence,
+                                             GFP_ATOMIC));
+                       if (ret)
                                goto out;
-                       }
                }
 
                seqno = g2h_fence->seqno;
@@ -879,14 +875,11 @@ retry:
 retry_same_fence:
        ret = guc_ct_send(ct, action, len, 0, 0, &g2h_fence);
        if (unlikely(ret == -ENOMEM)) {
-               void *ptr;
-
                /* Retry allocation /w GFP_KERNEL */
-               ptr = xa_store(&ct->fence_lookup,
-                              g2h_fence.seqno,
-                              &g2h_fence, GFP_KERNEL);
-               if (IS_ERR(ptr))
-                       return PTR_ERR(ptr);
+               ret = xa_err(xa_store(&ct->fence_lookup, g2h_fence.seqno,
+                                     &g2h_fence, GFP_KERNEL));
+               if (ret)
+                       return ret;
 
                goto retry_same_fence;
        } else if (unlikely(ret)) {