Commit f0403272 authored by Matthew Auld's avatar Matthew Auld
Browse files

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



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

Fixes: dd08ebf6 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
Signed-off-by: default avatarMatthew 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: default avatarBadal Nilawar <badal.nilawar@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241001084346.98516-7-matthew.auld@intel.com
parent 1aa4b786

drivers/gpu/drm/xe/xe_guc_submit.c

+3 −6
Original line number Diff line number Diff line
@@ -393,7 +393,6 @@ static void __release_guc_id(struct xe_guc *guc, struct xe_exec_queue *q, u32 xa 
static int alloc_guc_id(struct xe_guc *guc, struct xe_exec_queue *q)

{

	int ret;

	void *ptr;

	int i;



	/*
@@ -413,13 +412,11 @@ static int alloc_guc_id(struct xe_guc *guc, struct xe_exec_queue *q) 
	q->guc->id = ret;



	for (i = 0; i < q->width; ++i) {

		ptr = xa_store(&guc->submission_state.exec_queue_lookup,

			       q->guc->id + i, q, GFP_NOWAIT);

		if (IS_ERR(ptr)) {

			ret = PTR_ERR(ptr);

		ret = xa_err(xa_store(&guc->submission_state.exec_queue_lookup,

				      q->guc->id + i, q, GFP_NOWAIT));

		if (ret)

			goto err_release;

	}

	}



	return 0;