From: Anshuman Gupta <anshuman.gupta@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: sujaritha.sundaresan@intel.com, rodrigo.vivi@intel.com
Subject: [Intel-xe] [PATCH v5 1/5] drm/xe/pm: Add pci d3cold_capable support
Date: Thu, 13 Jul 2023 20:01:17 +0530 [thread overview]
Message-ID: <20230713143121.3901357-2-anshuman.gupta@intel.com> (raw)
In-Reply-To: <20230713143121.3901357-1-anshuman.gupta@intel.com>
Adding pci d3cold_capable check in order to initialize
d3cold_allowed as false statically.
It avoids vram save/restore latency during runtime
suspend/resume
v2:
- Added else block to xe_pci_runtime_idle. [Rodrigo]
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/xe/xe_device_types.h | 3 +++
drivers/gpu/drm/xe/xe_pci.c | 29 ++++++++++++++++------------
drivers/gpu/drm/xe/xe_pm.c | 22 +++++++++++++++++++++
drivers/gpu/drm/xe/xe_pm.h | 1 +
4 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index 26a8de77138a..66bde0578229 100644
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -347,6 +347,9 @@ struct xe_device {
bool hold_rpm;
} mem_access;
+ /** d3cold_capable: Indicates if root port is d3cold capable */
+ bool d3cold_capable;
+
/** @d3cold_allowed: Indicates if d3cold is a valid device state */
bool d3cold_allowed;
diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index 086fea4f2471..e8dc8c9574fc 100644
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -693,6 +693,7 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_pci_disable;
xe_pm_runtime_init(xe);
+ xe_pm_init(xe);
return 0;
@@ -805,18 +806,22 @@ 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);
- /*
- * TODO: d3cold should be allowed (true) if
- * (IS_DGFX(xe) && !xe_device_mem_access_ongoing(xe))
- * but maybe include some other conditions. So, before
- * we can re-enable the D3cold, we need to:
- * 1. rewrite the VRAM save / restore to avoid buffer object locks
- * 2. block D3cold if we have a big amount of device memory in use
- * in order to reduce the latency.
- * 3. at resume, detect if we really lost power and avoid memory
- * restoration if we were only up to d3cold
- */
- xe->d3cold_allowed = false;
+ if (!xe->d3cold_capable) {
+ xe->d3cold_allowed = false;
+ } else {
+ /*
+ * TODO: d3cold should be allowed (true) if
+ * (IS_DGFX(xe) && !xe_device_mem_access_ongoing(xe))
+ * but maybe include some other conditions. So, before
+ * we can re-enable the D3cold, we need to:
+ * 1. rewrite the VRAM save / restore to avoid buffer object locks
+ * 2. block D3cold if we have a big amount of device memory in use
+ * in order to reduce the latency.
+ * 3. at resume, detect if we really lost power and avoid memory
+ * restoration if we were only up to d3cold
+ */
+ xe->d3cold_allowed = false;
+ }
return 0;
}
diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c
index c7901f379aee..1b8f25586470 100644
--- a/drivers/gpu/drm/xe/xe_pm.c
+++ b/drivers/gpu/drm/xe/xe_pm.c
@@ -117,6 +117,21 @@ int xe_pm_resume(struct xe_device *xe)
return 0;
}
+static bool xe_pm_pci_d3cold_capable(struct pci_dev *pdev)
+{
+ struct pci_dev *root_pdev;
+
+ root_pdev = pcie_find_root_port(pdev);
+ if (!root_pdev)
+ return false;
+
+ /* D3Cold requires PME capability and _PR3 power resource */
+ if (!pci_pme_capable(root_pdev, PCI_D3cold) || !pci_pr3_present(root_pdev))
+ return false;
+
+ return true;
+}
+
void xe_pm_runtime_init(struct xe_device *xe)
{
struct device *dev = xe->drm.dev;
@@ -129,6 +144,13 @@ void xe_pm_runtime_init(struct xe_device *xe)
pm_runtime_put_autosuspend(dev);
}
+void xe_pm_init(struct xe_device *xe)
+{
+ struct pci_dev *pdev = to_pci_dev(xe->drm.dev);
+
+ xe->d3cold_capable = xe_pm_pci_d3cold_capable(pdev);
+}
+
void xe_pm_runtime_fini(struct xe_device *xe)
{
struct device *dev = xe->drm.dev;
diff --git a/drivers/gpu/drm/xe/xe_pm.h b/drivers/gpu/drm/xe/xe_pm.h
index 8418ee6faac5..864cd0be014a 100644
--- a/drivers/gpu/drm/xe/xe_pm.h
+++ b/drivers/gpu/drm/xe/xe_pm.h
@@ -14,6 +14,7 @@ int xe_pm_suspend(struct xe_device *xe);
int xe_pm_resume(struct xe_device *xe);
void xe_pm_runtime_init(struct xe_device *xe);
+void xe_pm_init(struct xe_device *xe);
void xe_pm_runtime_fini(struct xe_device *xe);
int xe_pm_runtime_suspend(struct xe_device *xe);
int xe_pm_runtime_resume(struct xe_device *xe);
--
2.38.0
next prev parent reply other threads:[~2023-07-13 14:32 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-13 14:31 [Intel-xe] [PATCH v5 0/5] D3Cold Policy Anshuman Gupta
2023-07-13 14:31 ` Anshuman Gupta [this message]
2023-07-13 14:31 ` [Intel-xe] [PATCH v5 2/5] drm/xe/pm: Refactor xe_pm_runtime_init Anshuman Gupta
2023-07-13 14:31 ` [Intel-xe] [PATCH v5 3/5] drm/xe/pm: Add vram_d3cold_threshold Sysfs Anshuman Gupta
2023-07-14 13:39 ` Rodrigo Vivi
2023-07-13 14:31 ` [Intel-xe] [PATCH v5 4/5] xe/drm/pm: Toggle d3cold_allowed using vram_usages Anshuman Gupta
2023-07-14 11:49 ` Nilawar, Badal
2023-07-14 12:02 ` Gupta, Anshuman
2023-07-14 12:20 ` Gupta, Anshuman
2023-07-13 14:31 ` [Intel-xe] [PATCH v5 5/5] drm/xe/pm: Init pcode and restore vram on power lost Anshuman Gupta
2023-07-13 20:41 ` Rodrigo Vivi
2023-07-14 11:06 ` Riana Tauro
2023-07-17 8:49 ` [Intel-xe] ✓ CI.Patch_applied: success for D3Cold Policy (rev6) Patchwork
2023-07-17 8:49 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-07-17 8:51 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-07-17 8:54 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-07-17 8:55 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-07-17 8:56 ` [Intel-xe] ✓ CI.checksparse: " Patchwork
2023-07-18 8:07 ` [Intel-xe] ✓ CI.Patch_applied: success for D3Cold Policy (rev7) Patchwork
2023-07-18 8:07 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-07-18 8:08 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-07-18 8:12 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-07-18 8:13 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-07-18 8:14 ` [Intel-xe] ✓ CI.checksparse: " Patchwork
2023-07-18 8:48 ` [Intel-xe] ○ CI.BAT: info " Patchwork
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=20230713143121.3901357-2-anshuman.gupta@intel.com \
--to=anshuman.gupta@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
--cc=sujaritha.sundaresan@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.