During the runtime suspend, check if device is capable of wakeup
from PME. If yes update the helper so that IRQ reset and HPD
polling can be handled accordingly. For PME capable devices,
HPD related IRQs are not reset during runtime suspend and
do not start polling for HPDs every 10s. Instead PME can be
generated from HPDs and corresponding runtime resume calls
can be invoked by PME.
v2: ensure that both software policy (device_may_wakeup()) and HW/
Platform (pci_dev_run_wake()) can support device wakeup
Bspec: 52979, 52980, 68857, 68867, 68970
Assisted-by: GitHub_Copilot:claude-opus-5
Signed-off-by: Vinod Govindapillai <[email protected]>
---
drivers/gpu/drm/xe/display/xe_display.c | 10 ++++++++++
drivers/gpu/drm/xe/display/xe_display.h | 4 ++++
drivers/gpu/drm/xe/xe_pci.c | 17 ++++++++++++++++-
drivers/gpu/drm/xe/xe_pm.c | 24 ++++++++++++++++++++++++
drivers/gpu/drm/xe/xe_pm.h | 1 +
5 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/display/xe_display.c
b/drivers/gpu/drm/xe/display/xe_display.c
index 7b25c0814674..ff4a74c5c763 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -236,6 +236,16 @@ void xe_display_irq_postinstall(struct xe_device *xe)
intel_display_irq_postinstall(display);
}
+void xe_display_set_pme_capable(struct xe_device *xe, bool pme_from_hpd)
+{
+ struct intel_display *display = xe->display;
+
+ if (!xe->info.probe_display)
+ return;
+
+ intel_hpd_set_pme_capable(display, pme_from_hpd);
+}
+
static bool suspend_to_idle(void)
{
#if IS_ENABLED(CONFIG_ACPI_SLEEP)
diff --git a/drivers/gpu/drm/xe/display/xe_display.h
b/drivers/gpu/drm/xe/display/xe_display.h
index 0babb50bfc77..a77a8fa1d802 100644
--- a/drivers/gpu/drm/xe/display/xe_display.h
+++ b/drivers/gpu/drm/xe/display/xe_display.h
@@ -37,6 +37,8 @@ void xe_display_irq_enable(struct xe_device *xe, u32
gu_misc_iir);
void xe_display_irq_reset(struct xe_device *xe);
void xe_display_irq_postinstall(struct xe_device *xe);
+void xe_display_set_pme_capable(struct xe_device *xe, bool pme_from_hpd);
+
void xe_display_pm_suspend(struct xe_device *xe);
void xe_display_pm_suspend_late(struct xe_device *xe);
void xe_display_pm_resume_early(struct xe_device *xe);
@@ -75,6 +77,8 @@ static inline void xe_display_irq_enable(struct xe_device
*xe, u32 gu_misc_iir)
static inline void xe_display_irq_reset(struct xe_device *xe) {}
static inline void xe_display_irq_postinstall(struct xe_device *xe) {}
+static inline void xe_display_set_pme_capable(struct xe_device *xe, bool
pme_from_hpd) {}
+
static inline void xe_display_pm_suspend(struct xe_device *xe) {}
static inline void xe_display_pm_suspend_late(struct xe_device *xe) {}
static inline void xe_display_pm_resume_early(struct xe_device *xe) {}
diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index f8e16aefd2f8..e510917490d1 100644
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -1385,6 +1385,9 @@ static int xe_pci_runtime_suspend(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
struct xe_device *xe = pdev_to_xe_device(pdev);
+ pci_power_t state = xe->d3cold.allowed ? PCI_D3cold : PCI_D3hot;
+ bool pme_capable = xe_pm_pme_supported(xe) &&
+ pci_enable_wake(pdev, state, true) == 0;
int err;
/*
@@ -1396,9 +1399,17 @@ static int xe_pci_runtime_suspend(struct device *dev)
xe_assert(xe, !IS_SRIOV_VF(xe));
xe_assert(xe, !pci_num_vf(pdev));
+ xe_display_set_pme_capable(xe, pme_capable);
+
err = xe_pm_runtime_suspend(xe);
- if (err)
+ if (err) {
+ if (pme_capable) {
+ pci_enable_wake(pdev, state, false);
+ xe_display_set_pme_capable(xe, false);
+ }
+
return err;
+ }
pci_save_state(pdev);
@@ -1419,12 +1430,16 @@ static int xe_pci_runtime_resume(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
struct xe_device *xe = pdev_to_xe_device(pdev);
+ pci_power_t state = xe->d3cold.allowed ? PCI_D3cold : PCI_D3hot;
int err;
err = pci_set_power_state(pdev, PCI_D0);
if (err)
return err;
+ pci_enable_wake(pdev, state, false);
+ xe_display_set_pme_capable(xe, false);
+
pci_restore_state(pdev);
if (xe->d3cold.allowed) {
diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c
index f517bf453b54..e6b18968e486 100644
--- a/drivers/gpu/drm/xe/xe_pm.c
+++ b/drivers/gpu/drm/xe/xe_pm.c
@@ -92,6 +92,8 @@ static struct lockdep_map xe_pm_block_lockdep_map = {
};
#endif
+#define HAS_PM_PME_SUPPORT(xe) (GRAPHICS_VERx100(xe) >= 3500)
+
static void xe_pm_block_begin_signalling(void)
{
lock_acquire_shared_recursive(&xe_pm_block_lockdep_map, 0, 1, NULL,
_RET_IP_);
@@ -738,6 +740,28 @@ int xe_pm_runtime_resume(struct xe_device *xe)
return err;
}
+/**
+ * xe_pm_pme_supported - Can the device signal PME from its suspend target
state?
+ * @xe: xe device instance
+ *
+ * Determine whether the device can generate a Power Management Event while
+ * runtime suspended.
+ *
+ * Return: true if PME is supported from the target state, false otherwise.
+ */
+bool xe_pm_pme_supported(struct xe_device *xe)
+{
+ struct pci_dev *pdev = to_pci_dev(xe->drm.dev);
+
+ if (!HAS_PM_PME_SUPPORT(xe))
+ return false;
+
+ if (!device_may_wakeup(&pdev->dev))
+ return false;
+
+ return pci_dev_run_wake(pdev);
+}
+
/*
* For places where resume is synchronous it can be quite easy to deadlock
* if we are not careful. Also in practice it might be quite timing
diff --git a/drivers/gpu/drm/xe/xe_pm.h b/drivers/gpu/drm/xe/xe_pm.h
index 6d5ab09cb769..16b8699e59ec 100644
--- a/drivers/gpu/drm/xe/xe_pm.h
+++ b/drivers/gpu/drm/xe/xe_pm.h
@@ -30,6 +30,7 @@ bool xe_pm_runtime_get_if_active(struct xe_device *xe);
bool xe_pm_runtime_get_if_in_use(struct xe_device *xe);
void xe_pm_runtime_get_noresume(struct xe_device *xe);
bool xe_pm_runtime_resume_and_get(struct xe_device *xe);
+bool xe_pm_pme_supported(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);
--
2.43.0
