[PATCH v4 2/9] drm/xe/guc_submit: Introduce xe_guc_submit_reinit()

[Raag Jadav <raag.jadav@intel.com>]

In preparation of usecases which require re-initializing GuC submission
after PCIe FLR, introduce xe_guc_submit_reinit() helper. This will restore
exec queues which might have been killed before PCIe FLR.

Signed-off-by: Raag Jadav <raag.jadav@intel.com>
---
v4: Teardown exec queues instead of mangling scheduler pending list (Matthew Brost)
---
 drivers/gpu/drm/xe/xe_gpu_scheduler.h |  5 ++++
 drivers/gpu/drm/xe/xe_guc_submit.c    | 35 +++++++++++++++++++++++++++
 drivers/gpu/drm/xe/xe_guc_submit.h    |  1 +
 3 files changed, 41 insertions(+)

diff --git a/drivers/gpu/drm/xe/xe_gpu_scheduler.h b/drivers/gpu/drm/xe/xe_gpu_scheduler.h
index 664c2db56af3..1e079ca3891c 100644
--- a/drivers/gpu/drm/xe/xe_gpu_scheduler.h
+++ b/drivers/gpu/drm/xe/xe_gpu_scheduler.h
@@ -51,6 +51,11 @@ static inline void xe_sched_tdr_queue_imm(struct xe_gpu_scheduler *sched)
 	drm_sched_tdr_queue_imm(&sched->base);
 }
 
+static inline void xe_sched_update_timeout(struct xe_gpu_scheduler *sched, long timeout)
+{
+	sched->base.timeout = timeout;
+}
+
 static inline void xe_sched_resubmit_jobs(struct xe_gpu_scheduler *sched)
 {
 	struct drm_sched_job *s_job;
diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
index a145234f662b..c92bf42b8d3d 100644
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@ -193,6 +193,11 @@ static void set_exec_queue_killed(struct xe_exec_queue *q)
 	atomic_or(EXEC_QUEUE_STATE_KILLED, &q->guc->state);
 }
 
+static void clear_exec_queue_killed(struct xe_exec_queue *q)
+{
+	atomic_and(~EXEC_QUEUE_STATE_KILLED, &q->guc->state);
+}
+
 static bool exec_queue_wedged(struct xe_exec_queue *q)
 {
 	return atomic_read(&q->guc->state) & EXEC_QUEUE_STATE_WEDGED;
@@ -347,6 +352,36 @@ int xe_guc_submit_init(struct xe_guc *guc, unsigned int num_ids)
 	return devm_add_action_or_reset(xe->drm.dev, guc_submit_fini, guc);
 }
 
+/**
+ * xe_guc_submit_reinit() - Re-initialize GuC submission.
+ * @guc: the &xe_guc to re-initialize
+ */
+void xe_guc_submit_reinit(struct xe_guc *guc)
+{
+	struct xe_exec_queue *q;
+	unsigned long index;
+
+	xe_gt_assert(guc_to_gt(guc), xe_guc_read_stopped(guc) == 1);
+
+	mutex_lock(&guc->submission_state.lock);
+
+	xa_for_each(&guc->submission_state.exec_queue_lookup, index, q) {
+		struct xe_gpu_scheduler *sched = &q->guc->sched;
+		long timeout;
+
+		/* Prevent redundant attempts to reinit parallel queues */
+		if (q->guc->id != index)
+			continue;
+
+		timeout = (q->vm && xe_vm_in_lr_mode(q->vm)) ? MAX_SCHEDULE_TIMEOUT :
+			   msecs_to_jiffies(q->sched_props.job_timeout_ms);
+		xe_sched_update_timeout(sched, timeout);
+		clear_exec_queue_killed(q);
+	}
+
+	mutex_unlock(&guc->submission_state.lock);
+}
+
 /*
  * Given that we want to guarantee enough RCS throughput to avoid missing
  * frames, we set the yield policy to 20% of each 80ms interval.
diff --git a/drivers/gpu/drm/xe/xe_guc_submit.h b/drivers/gpu/drm/xe/xe_guc_submit.h
index b3839a90c142..a40aef196cbf 100644
--- a/drivers/gpu/drm/xe/xe_guc_submit.h
+++ b/drivers/gpu/drm/xe/xe_guc_submit.h
@@ -13,6 +13,7 @@ struct xe_exec_queue;
 struct xe_guc;
 
 int xe_guc_submit_init(struct xe_guc *guc, unsigned int num_ids);
+void xe_guc_submit_reinit(struct xe_guc *guc);
 int xe_guc_submit_enable(struct xe_guc *guc);
 void xe_guc_submit_disable(struct xe_guc *guc);
 
-- 
2.43.0