Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] drm/xe/vf: Fix up GGTT on S4 resume under SR-IOV
@ 2025-10-23  6:46 Satyanarayana K V P
  2025-10-23  7:06 ` ✓ CI.KUnit: success for drm/xe/vf: Fix up GGTT on S4 resume under SR-IOV (rev2) Patchwork
                   ` (4 more replies)
  0 siblings, 5 replies; 8+ messages in thread
From: Satyanarayana K V P @ 2025-10-23  6:46 UTC (permalink / raw)
  To: intel-xe
  Cc: Satyanarayana K V P, Michal Wajdeczko, Michal Winiarski,
	Matthew Brost, Tomasz Lis

With SRIOV enabled, while resuming from S4, there is a possibility that,
the VM might have been suspended on one VF and resumed on another VF.
Since GGTT space is not virtualized, we need to fixup all the GGTT
references while resuming.

While resuming from S4, check whether the GGTT space is same or not for
the given VF and fix-up if it is different.

Signed-off-by: Satyanarayana K V P <satyanarayana.k.v.p@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michal Winiarski <michal.winiarski@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Tomasz Lis <tomasz.lis@intel.com>
---
V1 -> V2:
- Rebased to latest drm-tip.
---
 drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 32 +++++++++++++++++++++++++++++
 drivers/gpu/drm/xe/xe_gt_sriov_vf.h |  1 +
 drivers/gpu/drm/xe/xe_pm.c          | 12 +++++++++++
 3 files changed, 45 insertions(+)

diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
index d0b102ab6ce8..38528495478f 100644
--- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
+++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
@@ -1375,3 +1375,35 @@ void xe_gt_sriov_vf_wait_valid_ggtt(struct xe_gt *gt)
 					       HZ * 5);
 	xe_gt_WARN_ON(gt, !ret);
 }
+
+/**
+ * xe_sriov_vf_fixup_ggtt - Fix up GGTT on resume from S4.
+ * @gt: the &xe_gt.
+ *
+ * This function shall be called only by VF.
+ * Main GT and media GT share the same GGTT space. So, fixups are needed
+ * only for Main GT.
+ *
+ * Returns: 0 if the operation completed successfully, or a negative
+ * error code otherwise.
+ */
+int xe_gt_sriov_vf_fixup_ggtt(struct xe_gt *gt)
+{
+	int err = 0;
+
+	xe_gt_assert(gt, IS_SRIOV_VF(gt_to_xe(gt)));
+
+	if (gt->info.type != XE_GT_TYPE_MAIN)
+		return err;
+
+	xe_guc_comm_init_early(&gt->uc.guc);
+	err = xe_gt_sriov_vf_bootstrap(gt);
+	if (err)
+		goto out;
+
+	err = vf_post_migration_fixups(gt);
+
+out:
+	return err;
+}
+
diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.h b/drivers/gpu/drm/xe/xe_gt_sriov_vf.h
index af40276790fa..17004223f33a 100644
--- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.h
+++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.h
@@ -39,5 +39,6 @@ void xe_gt_sriov_vf_print_runtime(struct xe_gt *gt, struct drm_printer *p);
 void xe_gt_sriov_vf_print_version(struct xe_gt *gt, struct drm_printer *p);
 
 void xe_gt_sriov_vf_wait_valid_ggtt(struct xe_gt *gt);
+int xe_gt_sriov_vf_fixup_ggtt(struct xe_gt *gt);
 
 #endif
diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c
index 210298c4bcb1..68bf08ae62f6 100644
--- a/drivers/gpu/drm/xe/xe_pm.c
+++ b/drivers/gpu/drm/xe/xe_pm.c
@@ -19,6 +19,7 @@
 #include "xe_ggtt.h"
 #include "xe_gt.h"
 #include "xe_gt_idle.h"
+#include "xe_gt_sriov_vf.h"
 #include "xe_i2c.h"
 #include "xe_irq.h"
 #include "xe_late_bind_fw.h"
@@ -248,6 +249,17 @@ int xe_pm_resume(struct xe_device *xe)
 
 	xe_display_pm_resume_early(xe);
 
+	/* GGTT fixups (if needed) have to be done before restoring BOs */
+	if (IS_SRIOV_VF(xe)) {
+		for_each_gt(gt, xe, id) {
+			err = xe_gt_sriov_vf_fixup_ggtt(gt);
+			if (err) {
+				drm_err(&xe->drm, "GGTT fixups failed with %d\n", err);
+				return err;
+			}
+		}
+	}
+
 	/*
 	 * This only restores pinned memory which is the memory required for the
 	 * GT(s) to resume.
-- 
2.51.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-11-03 11:16 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-23  6:46 [PATCH v2] drm/xe/vf: Fix up GGTT on S4 resume under SR-IOV Satyanarayana K V P
2025-10-23  7:06 ` ✓ CI.KUnit: success for drm/xe/vf: Fix up GGTT on S4 resume under SR-IOV (rev2) Patchwork
2025-10-23  7:44 ` ✓ Xe.CI.BAT: " Patchwork
2025-10-23 13:25 ` ✗ Xe.CI.Full: failure " Patchwork
2025-10-24  2:49 ` [PATCH v2] drm/xe/vf: Fix up GGTT on S4 resume under SR-IOV Matthew Brost
2025-10-24  4:09   ` K V P, Satyanarayana
2025-10-24 15:58     ` Matthew Brost
2025-11-03 11:16 ` Michal Wajdeczko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox