mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-07 11:33:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/xe: Ensure memory eviction on s2idle.

Browse Source 
On discrete cards we cannot allow the pci subsystem to skip
the regular suspend and we need to unblock the d3cold.

Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Reviewed-by: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
Rodrigo Vivi
2023-07-25 18:11:59 -04:00
parent a32d82b4cf
commit d87c424afa
2 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/gpu/drm/xe/xe_pci.c
View File

@@ -30,6 +30,28 @@ enum toggle_d3cold {
D3COLD_ENABLE,
};
static void d3cold_toggle(struct pci_dev *pdev, enum toggle_d3cold toggle)
{
struct xe_device *xe = pdev_to_xe_device(pdev);
struct pci_dev *root_pdev;
if (!xe->d3cold.capable)
return;
root_pdev = pcie_find_root_port(pdev);
if (!root_pdev)
return;
switch (toggle) {
case D3COLD_DISABLE:
pci_d3cold_disable(root_pdev);
break;
case D3COLD_ENABLE:
pci_d3cold_enable(root_pdev);
break;
}
}
struct xe_subplatform_desc {
enum xe_subplatform subplatform;
const char *name;
@@ -697,6 +719,13 @@ static int xe_pci_suspend(struct device *dev)
if (err)
return err;
/*
* Enabling D3Cold is needed for S2Idle/S0ix.
* It is save to allow here since xe_pm_suspend has evicted
* the local memory and the direct complete optimization is disabled.
*/
d3cold_toggle(pdev, D3COLD_ENABLE);
pci_save_state(pdev);
pci_disable_device(pdev);
@@ -712,6 +741,9 @@ 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*/
d3cold_toggle(pdev, D3COLD_DISABLE);
err = pci_set_power_state(pdev, PCI_D0);
if (err)
return err;
@@ -731,28 +763,6 @@ static int xe_pci_resume(struct device *dev)
return 0;
}
static void d3cold_toggle(struct pci_dev *pdev, enum toggle_d3cold toggle)
{
struct xe_device *xe = pdev_to_xe_device(pdev);
struct pci_dev *root_pdev;
if (!xe->d3cold.capable)
return;
root_pdev = pcie_find_root_port(pdev);
if (!root_pdev)
return;
switch (toggle) {
case D3COLD_DISABLE:
pci_d3cold_disable(root_pdev);
break;
case D3COLD_ENABLE:
pci_d3cold_enable(root_pdev);
break;
}
}
static int xe_pci_runtime_suspend(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);

11
drivers/gpu/drm/xe/xe_pm.c
View File

@@ -128,6 +128,17 @@ static void xe_pm_runtime_init(struct xe_device *xe)
{
struct device *dev = xe->drm.dev;
/*
* Disable the system suspend direct complete optimization.
* We need to ensure that the regular device suspend/resume functions
* are called since our runtime_pm cannot guarantee local memory
* eviction for d3cold.
* TODO: Check HDA audio dependencies claimed by i915, and then enforce
* this option to integrated graphics as well.
*/
if (IS_DGFX(xe))
dev_pm_set_driver_flags(dev, DPM_FLAG_NO_DIRECT_COMPLETE);
pm_runtime_use_autosuspend(dev);
pm_runtime_set_autosuspend_delay(dev, 1000);
pm_runtime_set_active(dev);