diff options
| author | Michal Wajdeczko <michal.wajdeczko@intel.com> | 2024-04-06 16:39:45 +0200 |
|---|---|---|
| committer | Michal Wajdeczko <michal.wajdeczko@intel.com> | 2024-04-08 11:22:17 +0200 |
| commit | 104f7519db0a6ba4d1df1d77e4244e6f96d809ee (patch) | |
| tree | 4487f160dc5a82112180e4c11c50202b4f014dab /drivers/gpu/drm/xe/xe_guc_submit.c | |
| parent | 1d7d997cd764ad1d462d857e3036d61bbcf534d1 (diff) | |
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: 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-1-michal.wajdeczko@intel.com
Diffstat (limited to 'drivers/gpu/drm/xe/xe_guc_submit.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc_submit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c index 9c30bd9ac8c0..4c444fddfba6 100644 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@ -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); |