Unverified Commit a06a7b34 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Rodrigo Vivi
Browse files

drm/xe/uc: Use devm to register cleanup that includes exec_queues 



Exec_queue cleanup requires HW access, so we need to use devm instead of
drmm for it.

Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240815230541.3828206-2-lucas.demarchi@intel.com


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
(cherry picked from commit 5a891a0e)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 8636a5c2

drivers/gpu/drm/xe/xe_gsc.c

+2 −2
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ int xe_gsc_init(struct xe_gsc *gsc) 
	return ret;

}



static void free_resources(struct drm_device *drm, void *arg)

static void free_resources(void *arg)

{

	struct xe_gsc *gsc = arg;
@@ -501,7 +501,7 @@ int xe_gsc_init_post_hwconfig(struct xe_gsc *gsc) 
	gsc->q = q;

	gsc->wq = wq;



	err = drmm_add_action_or_reset(&xe->drm, free_resources, gsc);

	err = devm_add_action_or_reset(xe->drm.dev, free_resources, gsc);

	if (err)

		return err;

drivers/gpu/drm/xe/xe_guc_submit.c

+2 −2
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static void guc_submit_fini(struct drm_device *drm, void *arg) 
	free_submit_wq(guc);

}



static void guc_submit_wedged_fini(struct drm_device *drm, void *arg)

static void guc_submit_wedged_fini(void *arg)

{

	struct xe_guc *guc = arg;

	struct xe_exec_queue *q;
@@ -877,7 +877,7 @@ void xe_guc_submit_wedge(struct xe_guc *guc) 


	xe_gt_assert(guc_to_gt(guc), guc_to_xe(guc)->wedged.mode);



	err = drmm_add_action_or_reset(&guc_to_xe(guc)->drm,

	err = devm_add_action_or_reset(guc_to_xe(guc)->drm.dev,

				       guc_submit_wedged_fini, guc);

	if (err) {

		drm_err(&xe->drm, "Failed to register xe_guc_submit clean-up on wedged.mode=2. Although device is wedged.\n");