Commit 5b7e50e2 authored by Matthew Auld's avatar Matthew Auld Committed by Rodrigo Vivi

drm/xe/pm: fix unbalanced ref handling

In local_pci_probe() the core kernel increments the rpm for the device,
just before calling into the probe hook. If the driver/device supports
runtime pm it is then meant to put this ref during probe (like we do in
xe_pm_runtime_init()). However when removing the device we then also
need to take the reference back, otherwise the ref that is put in
pci_device_remove() will be unbalanced when for example unloading the
driver, leading to warnings like:

    [ 3808.596345] xe 0000:03:00.0: Runtime PM usage count underflow!

Fix this by incrementing the rpm ref when removing the device.

v2:
  - Improve the terminology in the commit message; s/drop/put/ etc (Lucas & Rodrigo)
  - Also call pm_runtime_forbid(dev) (Rodrigo)

Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/193Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 84ff5500
...@@ -364,6 +364,7 @@ static void xe_pci_remove(struct pci_dev *pdev) ...@@ -364,6 +364,7 @@ static void xe_pci_remove(struct pci_dev *pdev)
return; return;
xe_device_remove(xe); xe_device_remove(xe);
xe_pm_runtime_fini(xe);
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
} }
......
...@@ -117,6 +117,14 @@ void xe_pm_runtime_init(struct xe_device *xe) ...@@ -117,6 +117,14 @@ void xe_pm_runtime_init(struct xe_device *xe)
pm_runtime_put_autosuspend(dev); pm_runtime_put_autosuspend(dev);
} }
void xe_pm_runtime_fini(struct xe_device *xe)
{
struct device *dev = xe->drm.dev;
pm_runtime_get_sync(dev);
pm_runtime_forbid(dev);
}
int xe_pm_runtime_suspend(struct xe_device *xe) int xe_pm_runtime_suspend(struct xe_device *xe)
{ {
struct xe_gt *gt; struct xe_gt *gt;
......
...@@ -14,6 +14,7 @@ int xe_pm_suspend(struct xe_device *xe); ...@@ -14,6 +14,7 @@ int xe_pm_suspend(struct xe_device *xe);
int xe_pm_resume(struct xe_device *xe); int xe_pm_resume(struct xe_device *xe);
void xe_pm_runtime_init(struct xe_device *xe); void xe_pm_runtime_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_suspend(struct xe_device *xe);
int xe_pm_runtime_resume(struct xe_device *xe); int xe_pm_runtime_resume(struct xe_device *xe);
int xe_pm_runtime_get(struct xe_device *xe); int xe_pm_runtime_get(struct xe_device *xe);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment