mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-08 09:12:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/xe/guc: Initialize GuC ID manager sooner

Browse Source 
The GuC submission cleanup code may depend on the GuC ID manager,
thus we can't initialize it after registering a submission cleanup
action, as reverse cleanup sequence will destroy GuC ID manager
prior to a call to guc_submit_fini().

Move GuC ID manager initialization up, right after managed mutex
initialization, to have it available during guc_submit_fini().

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240406143946.979-2-michal.wajdeczko@intel.com
This commit is contained in:
Michal Wajdeczko
2024-04-06 16:39:46 +02:00
parent 104f7519db
commit 83787afe06
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/xe/xe_guc_submit.c
View File

@@ -266,6 +266,10 @@ int xe_guc_submit_init(struct xe_guc *guc)
if (err)
return err;
err = xe_guc_id_mgr_init(&guc->submission_state.idm, ~0);
if (err)
return err;
err = alloc_submit_wq(guc);
if (err)
return err;
@@ -279,15 +283,7 @@ int xe_guc_submit_init(struct xe_guc *guc)
primelockdep(guc);
err = drmm_add_action_or_reset(&xe->drm, guc_submit_fini, guc);
if (err)
return err;
err = xe_guc_id_mgr_init(&guc->submission_state.idm, ~0);
if (err)
return err;
return 0;
return drmm_add_action_or_reset(&xe->drm, guc_submit_fini, guc);
}
static void __release_guc_id(struct xe_guc *guc, struct xe_exec_queue *q, u32 xa_count)