Commit 104f7519 authored by Michal Wajdeczko's avatar Michal Wajdeczko
Browse files

drm/xe/guc: Use drm_device-managed version of mutex_init() 



This is safer approach and will help resolve a cleanup ordering
conflict related to the GuC ID manager.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240406143946.979-1-michal.wajdeczko@intel.com
parent 1d7d997c

drivers/gpu/drm/xe/xe_guc_submit.c

+4 −2
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ static void guc_submit_fini(struct drm_device *drm, void *arg) 


	xa_destroy(&guc->submission_state.exec_queue_lookup);

	free_submit_wq(guc);

	mutex_destroy(&guc->submission_state.lock);

}



static const struct xe_exec_queue_ops guc_exec_queue_ops;
@@ -263,13 +262,16 @@ int xe_guc_submit_init(struct xe_guc *guc) 
	struct xe_gt *gt = guc_to_gt(guc);

	int err;



	err = drmm_mutex_init(&xe->drm, &guc->submission_state.lock);

	if (err)

		return err;



	err = alloc_submit_wq(guc);

	if (err)

		return err;



	gt->exec_queue_ops = &guc_exec_queue_ops;



	mutex_init(&guc->submission_state.lock);

	xa_init(&guc->submission_state.exec_queue_lookup);



	spin_lock_init(&guc->submission_state.suspend.lock);