From: Badal Nilawar <badal.nilawar@intel.com>
To: intel-xe@lists.freedesktop.org, linux-acpi@vger.kernel.org,
linux-pci@vger.kernel.org
Cc: anshuman.gupta@intel.com, rafael@kernel.org, lenb@kernel.org,
bhelgaas@google.com, ilpo.jarvinen@linux.intel.com,
lucas.demarchi@intel.com, rodrigo.vivi@intel.com,
varun.gupta@intel.com, ville.syrjala@linux.intel.com,
uma.shankar@intel.com, karthik.poosa@intel.com
Subject: [PATCH v5 08/12] drm/xe/vrsr: Refactor d3cold.allowed to a enum
Date: Wed, 15 Oct 2025 13:37:06 +0530 [thread overview]
Message-ID: <20251015080710.1468409-9-badal.nilawar@intel.com> (raw)
In-Reply-To: <20251015080710.1468409-1-badal.nilawar@intel.com>
From: Anshuman Gupta <anshuman.gupta@intel.com>
Add xe_d3_state enum to add support for VRAM Self Refresh
d3cold state.
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
Reviewed-by: Karthik Poosa <karthik.poosa@intel.com>
---
V2: Rebased
---
drivers/gpu/drm/xe/display/xe_display.c | 6 +++---
drivers/gpu/drm/xe/xe_device_types.h | 5 +++--
drivers/gpu/drm/xe/xe_pci.c | 6 +++---
drivers/gpu/drm/xe/xe_pm.c | 21 +++++++++++----------
drivers/gpu/drm/xe/xe_pm.h | 8 +++++++-
5 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 205040f43ddd..35d09109462e 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -395,7 +395,7 @@ void xe_display_pm_runtime_suspend(struct xe_device *xe)
if (!xe->info.probe_display)
return;
- if (xe->d3cold.allowed) {
+ if (xe->d3cold.target_state) {
xe_display_enable_d3cold(xe);
return;
}
@@ -421,7 +421,7 @@ void xe_display_pm_runtime_suspend_late(struct xe_device *xe)
if (!xe->info.probe_display)
return;
- if (xe->d3cold.allowed)
+ if (xe->d3cold.target_state)
xe_display_pm_suspend_late(xe);
/*
@@ -501,7 +501,7 @@ void xe_display_pm_runtime_resume(struct xe_device *xe)
if (!xe->info.probe_display)
return;
- if (xe->d3cold.allowed) {
+ if (xe->d3cold.target_state) {
xe_display_disable_d3cold(xe);
return;
}
diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index da81e1937918..a139f8aec33b 100644
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -20,6 +20,7 @@
#include "xe_memirq_types.h"
#include "xe_oa_types.h"
#include "xe_platform_types.h"
+#include "xe_pm.h"
#include "xe_pmu_types.h"
#include "xe_pt_types.h"
#include "xe_sriov_pf_types.h"
@@ -510,8 +511,8 @@ struct xe_device {
/** @d3cold.capable: Indicates if root port is d3cold capable */
bool capable;
- /** @d3cold.allowed: Indicates if d3cold is a valid device state */
- bool allowed;
+ /** @d3cold.target_state: Indicates d3cold target state */
+ enum xe_d3_state target_state;
/** @d3cold.vrsr_capable: Indicates if d3cold VRAM Self Refresh is supported */
bool vrsr_capable;
diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index 0cc14ddd92de..eb60cf44c1d7 100644
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -1118,7 +1118,7 @@ static int xe_pci_runtime_suspend(struct device *dev)
pci_save_state(pdev);
- if (xe->d3cold.allowed) {
+ if (xe->d3cold.target_state) {
d3cold_toggle(pdev, D3COLD_ENABLE);
pci_disable_device(pdev);
pci_ignore_hotplug(pdev);
@@ -1143,7 +1143,7 @@ static int xe_pci_runtime_resume(struct device *dev)
pci_restore_state(pdev);
- if (xe->d3cold.allowed) {
+ if (xe->d3cold.target_state) {
err = pci_enable_device(pdev);
if (err)
return err;
@@ -1159,7 +1159,7 @@ static int xe_pci_runtime_idle(struct device *dev)
struct pci_dev *pdev = to_pci_dev(dev);
struct xe_device *xe = pdev_to_xe_device(pdev);
- xe_pm_d3cold_allowed_toggle(xe);
+ xe_pm_d3cold_target_state_toggle(xe);
return 0;
}
diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c
index 61466bf0bba6..aa38dbe1e368 100644
--- a/drivers/gpu/drm/xe/xe_pm.c
+++ b/drivers/gpu/drm/xe/xe_pm.c
@@ -719,7 +719,7 @@ int xe_pm_runtime_suspend(struct xe_device *xe)
xe_display_pm_runtime_suspend(xe);
- if (xe->d3cold.allowed) {
+ if (xe->d3cold.target_state) {
err = xe_bo_evict_all(xe);
if (err)
goto out_resume;
@@ -771,7 +771,7 @@ int xe_pm_runtime_resume(struct xe_device *xe)
for_each_gt(gt, xe, id)
xe_gt_idle_disable_c6(gt);
- if (xe->d3cold.allowed) {
+ if (xe->d3cold.target_state) {
err = xe_pcode_ready(xe, true);
if (err)
goto out;
@@ -787,7 +787,8 @@ int xe_pm_runtime_resume(struct xe_device *xe)
goto out;
}
- xe_i2c_pm_resume(xe, xe->d3cold.allowed);
+ if (xe->d3cold.target_state != XE_D3HOT)
+ xe_i2c_pm_resume(xe, true);
xe_irq_resume(xe);
@@ -796,7 +797,7 @@ int xe_pm_runtime_resume(struct xe_device *xe)
xe_display_pm_runtime_resume(xe);
- if (xe->d3cold.allowed) {
+ if (xe->d3cold.target_state) {
err = xe_bo_restore_late(xe);
if (err)
goto out;
@@ -807,7 +808,7 @@ int xe_pm_runtime_resume(struct xe_device *xe)
if (IS_VF_CCS_READY(xe))
xe_sriov_vf_ccs_register_context(xe);
- if (xe->d3cold.allowed)
+ if (xe->d3cold.target_state != XE_D3HOT)
xe_late_bind_fw_load(&xe->late_bind);
out:
@@ -1046,13 +1047,13 @@ int xe_pm_set_vram_threshold(struct xe_device *xe, u32 threshold)
}
/**
- * xe_pm_d3cold_allowed_toggle - Check conditions to toggle d3cold.allowed
+ * xe_pm_d3cold_target_state_toggle - Check conditions to toggle target_state
* @xe: xe device instance
*
* To be called during runtime_pm idle callback.
* Check for all the D3Cold conditions ahead of runtime suspend.
*/
-void xe_pm_d3cold_allowed_toggle(struct xe_device *xe)
+void xe_pm_d3cold_target_state_toggle(struct xe_device *xe)
{
struct ttm_resource_manager *man;
u32 total_vram_used_mb = 0;
@@ -1060,7 +1061,7 @@ void xe_pm_d3cold_allowed_toggle(struct xe_device *xe)
int i;
if (!xe->d3cold.capable) {
- xe->d3cold.allowed = false;
+ xe->d3cold.target_state = XE_D3HOT;
return;
}
@@ -1075,9 +1076,9 @@ void xe_pm_d3cold_allowed_toggle(struct xe_device *xe)
mutex_lock(&xe->d3cold.lock);
if (total_vram_used_mb < xe->d3cold.vram_threshold)
- xe->d3cold.allowed = true;
+ xe->d3cold.target_state = XE_D3COLD_OFF;
else
- xe->d3cold.allowed = false;
+ xe->d3cold.target_state = XE_D3HOT;
mutex_unlock(&xe->d3cold.lock);
}
diff --git a/drivers/gpu/drm/xe/xe_pm.h b/drivers/gpu/drm/xe/xe_pm.h
index 3d5a8c4a4971..f6c09841b0ae 100644
--- a/drivers/gpu/drm/xe/xe_pm.h
+++ b/drivers/gpu/drm/xe/xe_pm.h
@@ -12,6 +12,12 @@
struct xe_device;
+enum xe_d3_state {
+ XE_D3HOT = 0,
+ XE_D3COLD_VRSR,
+ XE_D3COLD_OFF,
+};
+
int xe_pm_suspend(struct xe_device *xe);
int xe_pm_resume(struct xe_device *xe);
@@ -30,7 +36,7 @@ void xe_pm_runtime_get_noresume(struct xe_device *xe);
bool xe_pm_runtime_resume_and_get(struct xe_device *xe);
void xe_pm_assert_unbounded_bridge(struct xe_device *xe);
int xe_pm_set_vram_threshold(struct xe_device *xe, u32 threshold);
-void xe_pm_d3cold_allowed_toggle(struct xe_device *xe);
+void xe_pm_d3cold_target_state_toggle(struct xe_device *xe);
bool xe_rpm_reclaim_safe(const struct xe_device *xe);
struct task_struct *xe_pm_read_callback_task(struct xe_device *xe);
int xe_pm_block_on_suspend(struct xe_device *xe);
--
2.34.1
next prev parent reply other threads:[~2025-10-15 8:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-15 8:06 [PATCH v5 00/12] VRAM Self Refresh Badal Nilawar
2025-10-15 8:06 ` [PATCH v5 01/12] PCI/ACPI: Add D3cold Aux Power Limit_DSM method Badal Nilawar
2025-10-27 19:03 ` Rafael J. Wysocki
2025-10-15 8:07 ` [PATCH v5 02/12] PCI/ACPI: Per Root/Switch Downstream Port allow one aux power limit request Badal Nilawar
2025-10-27 19:11 ` Rafael J. Wysocki
2025-10-15 8:07 ` [PATCH v5 03/12] PCI/ACPI: Add PERST# Assertion Delay _DSM method Badal Nilawar
2025-10-27 19:18 ` Rafael J. Wysocki
2025-10-15 8:07 ` [PATCH v5 04/12] drm/xe/vrsr: Introduce flag has_vrsr Badal Nilawar
2025-10-15 8:07 ` [PATCH v5 05/12] drm/xe/vrsr: Detect VRSR Capability Badal Nilawar
2025-10-15 8:07 ` [PATCH v5 06/12] drm/xe/vrsr: Initialize VRSR feature Badal Nilawar
2025-10-15 8:07 ` [PATCH v5 07/12] drm/xe/vrsr: Enable VRSR on default VGA boot device Badal Nilawar
2025-10-15 8:07 ` Badal Nilawar [this message]
2025-10-15 8:39 ` [PATCH v5 08/12] drm/xe/vrsr: Refactor d3cold.allowed to a enum Raag Jadav
2025-10-15 9:04 ` Nilawar, Badal
2025-10-15 9:08 ` Nilawar, Badal
2025-10-15 9:08 ` Gupta, Anshuman
2025-10-15 8:07 ` [PATCH v5 09/12] drm/xe/pm: D3cold target state Badal Nilawar
2025-10-15 8:07 ` [PATCH v5 10/12] drm/xe/vrsr: Enable VRSR Badal Nilawar
2025-10-15 8:07 ` [PATCH v5 11/12] drm/xe/pm/s2idle: Don't evict user BOs for D3hot and D3cold-VRSR state Badal Nilawar
2025-10-17 11:00 ` Matthew Auld
2025-10-15 8:07 ` [PATCH v5 12/12] drm/xe/vrsr: Introduce a debugfs node named vrsr_capable Badal Nilawar
2025-10-15 8:43 ` Poosa, Karthik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251015080710.1468409-9-badal.nilawar@intel.com \
--to=badal.nilawar@intel.com \
--cc=anshuman.gupta@intel.com \
--cc=bhelgaas@google.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=karthik.poosa@intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lucas.demarchi@intel.com \
--cc=rafael@kernel.org \
--cc=rodrigo.vivi@intel.com \
--cc=uma.shankar@intel.com \
--cc=varun.gupta@intel.com \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).