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>

diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
index 958dde8422d7e7bf071cbf2468b6d71b7d4473c2..a40287a7c3de8e2fde1cf15429c9cbf167771f2a 100644 (file)
--- 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 82bd93f7867d1344ff477571e9192bba921207bb..546ac6350a31ffce73680cd217b9b8500aebeeb0 100644 (file)
--- 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 */