diff options
| author | Matthew Brost <matthew.brost@intel.com> | 2024-04-24 22:47:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-10 12:01:10 +0200 |
| commit | baa6301d8257804002b84857016904644fb0ef3a (patch) | |
| tree | 4c8179e0e8dbb9f2cb2dda8a5c9cbf99881dc5d4 | |
| parent | 52372cc28bac46d1ac5deffd2537b02394155532 (diff) | |
| download | linux-stable-baa6301d8257804002b84857016904644fb0ef3a.tar.gz linux-stable-baa6301d8257804002b84857016904644fb0ef3a.tar.bz2 linux-stable-baa6301d8257804002b84857016904644fb0ef3a.zip | |
drm/xe: Delete unused GuC submission_state.suspend
[ Upstream commit 3f371a98deada9aee53d908c9aa53f6cdcb1300b ]
GuC submission_state.suspend is unused, delete it.
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240425054747.1918811-1-matthew.brost@intel.com
Stable-dep-of: 2d2be279f1ca ("drm/xe: fix UAF around queue destruction")
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc_submit.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc_types.h | 9 |
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c index 958dde8422d7..a40287a7c3de 100644 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@ -251,7 +251,6 @@ static void primelockdep(struct xe_guc *guc) fs_reclaim_acquire(GFP_KERNEL); mutex_lock(&guc->submission_state.lock); - might_lock(&guc->submission_state.suspend.lock); mutex_unlock(&guc->submission_state.lock); fs_reclaim_release(GFP_KERNEL); @@ -279,9 +278,6 @@ int xe_guc_submit_init(struct xe_guc *guc) xa_init(&guc->submission_state.exec_queue_lookup); - spin_lock_init(&guc->submission_state.suspend.lock); - guc->submission_state.suspend.context = dma_fence_context_alloc(1); - primelockdep(guc); return drmm_add_action_or_reset(&xe->drm, guc_submit_fini, guc); diff --git a/drivers/gpu/drm/xe/xe_guc_types.h b/drivers/gpu/drm/xe/xe_guc_types.h index 82bd93f7867d..546ac6350a31 100644 --- a/drivers/gpu/drm/xe/xe_guc_types.h +++ b/drivers/gpu/drm/xe/xe_guc_types.h @@ -72,15 +72,6 @@ struct xe_guc { atomic_t stopped; /** @submission_state.lock: protects submission state */ struct mutex lock; - /** @submission_state.suspend: suspend fence state */ - struct { - /** @submission_state.suspend.lock: suspend fences lock */ - spinlock_t lock; - /** @submission_state.suspend.context: suspend fences context */ - u64 context; - /** @submission_state.suspend.seqno: suspend fences seqno */ - u32 seqno; - } suspend; #ifdef CONFIG_PROVE_LOCKING #define NUM_SUBMIT_WQ 256 /** @submission_state.submit_wq_pool: submission ordered workqueues pool */ |