[PATCH v6 10/12] drm/xe/vrsr: Enable VRSR

Badal Nilawar
2026-01-13T16:32:43Z

From: Anshuman Gupta <anshuman.gupta@intel.com>

Enable VRSR in runtime suspend and also in System wide suspend.
Also fix couple of typo in xe_pm.c.

V2: Disable VRSR in runtime/system resume path
V3: Handle BO eviction

Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: Badal Nilawar <badal.nilawar@intel.com>
Acked-by: Karthik Poosa <karthik.poosa@intel.com>
---
drivers/gpu/drm/xe/xe_pci.c | 4 +--
drivers/gpu/drm/xe/xe_pm.c | 52 ++++++++++++++++++++++++++++---------
2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index f1ec6aa26faa..8fc650b2de02 100644
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -1141,7 +1141,7 @@ static int xe_pci_suspend(struct device *dev)

/*
* Enabling D3Cold is needed for S2Idle/S0ix.
- * It is save to allow here since xe_pm_suspend has evicted
+ * It is safe to allow here since xe_pm_suspend has evicted
* the local memory and the direct complete optimization is disabled.
*/
d3cold_toggle(pdev, D3COLD_ENABLE);
@@ -1158,7 +1158,7 @@ static int xe_pci_resume(struct device *dev)
struct pci_dev *pdev = to_pci_dev(dev);
int err;

- /* Give back the D3Cold decision to the runtime P M*/
+ /* Give back the D3Cold decision to the runtime PM */
d3cold_toggle(pdev, D3COLD_DISABLE);

err = pci_set_power_state(pdev, PCI_D0);
diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c
index 2cbcb9de7586..1dd8e2c0f51e 100644
--- a/drivers/gpu/drm/xe/xe_pm.c
+++ b/drivers/gpu/drm/xe/xe_pm.c
@@ -205,10 +205,12 @@ int xe_pm_suspend(struct xe_device *xe, bool hibernation)

xe_display_pm_suspend(xe);

- /* FIXME: Super racey... */
- err = xe_bo_evict_all(xe);
- if (err)
- goto err_display;
+ if (hibernation || xe->d3cold.target_state != XE_D3COLD_VRSR) {
+ /* FIXME: Super racey... */
+ err = xe_bo_evict_all(xe);
+ if (err)
+ goto err;
+ }

for_each_gt(gt, xe, id) {
err = xe_gt_suspend(gt);
@@ -222,6 +224,12 @@ int xe_pm_suspend(struct xe_device *xe, bool hibernation)

xe_i2c_pm_suspend(xe);

+ if (!hibernation && xe->d3cold.target_state == XE_D3COLD_VRSR) {
+ err = xe_pm_vrsr_enable(xe);
+ if (err)
+ goto err_display;
+ }
+
drm_dbg(&xe->drm, "Device suspended\n");
xe_pm_block_end_signalling();

@@ -264,15 +272,20 @@ int xe_pm_resume(struct xe_device *xe, bool hibernation)
if (err)
return err;

+ if (!hibernation && xe->d3cold.target_state == XE_D3COLD_VRSR)
+ xe_pm_vrsr_disable(xe);
+
xe_display_pm_resume_early(xe);

/*
* This only restores pinned memory which is the memory required for the
* GT(s) to resume.
*/
- err = xe_bo_restore_early(xe);
- if (err)
- goto err;
+ if (hibernation || xe->d3cold.target_state != XE_D3COLD_VRSR) {
+ err = xe_bo_restore_early(xe);
+ if (err)
+ goto err;
+ }

xe_i2c_pm_resume(xe, true);

@@ -292,9 +305,11 @@ int xe_pm_resume(struct xe_device *xe, bool hibernation)
if (err)
goto err;

- err = xe_bo_restore_late(xe);
- if (err)
- goto err;
+ if (hibernation || xe->d3cold.target_state != XE_D3COLD_VRSR) {
+ err = xe_bo_restore_late(xe);
+ if (err)
+ goto err;
+ }

xe_pxp_pm_resume(xe->pxp);

@@ -740,7 +755,7 @@ int xe_pm_runtime_suspend(struct xe_device *xe)

xe_display_pm_runtime_suspend(xe);

- if (xe->d3cold.target_state) {
+ if (xe->d3cold.target_state == XE_D3COLD_OFF) {
err = xe_bo_evict_all(xe);
if (err)
goto out_resume;
@@ -758,6 +773,14 @@ int xe_pm_runtime_suspend(struct xe_device *xe)

xe_i2c_pm_suspend(xe);

+ if (xe->d3cold.target_state == XE_D3COLD_VRSR) {
+ err = xe_pm_vrsr_enable(xe);
+ if (err) {
+ drm_err(&xe->drm, "Failed to enable VRSR: %d\n", err);
+ goto out_resume;
+ }
+ }
+
xe_rpm_lockmap_release(xe);
xe_pm_write_callback_task(xe, NULL);
return 0;
@@ -789,6 +812,9 @@ int xe_pm_runtime_resume(struct xe_device *xe)

xe_rpm_lockmap_acquire(xe);

+ if (xe->d3cold.target_state == XE_D3COLD_VRSR)
+ xe_pm_vrsr_disable(xe);
+
if (xe->d3cold.target_state) {
for_each_gt(gt, xe, id)
xe_gt_idle_disable_c6(gt);
@@ -798,7 +824,9 @@ int xe_pm_runtime_resume(struct xe_device *xe)
goto out;

xe_display_pm_resume_early(xe);
+ }

+ if (xe->d3cold.target_state == XE_D3COLD_OFF) {
/*
* This only restores pinned memory which is the memory
* required for the GT(s) to resume.
@@ -826,7 +854,7 @@ int xe_pm_runtime_resume(struct xe_device *xe)
if (err)
goto out;

- if (xe->d3cold.target_state) {
+ if (xe->d3cold.target_state == XE_D3COLD_OFF) {
err = xe_bo_restore_late(xe);
if (err)
goto out;
--
2.52.0