Skip to contentSkip to conversation

drm/amdgpu: fix link error for !PM_SLEEP

PATCH In review Arnd Bergmann 3 participants 5 messages Jul 14, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: fix link error for !PM_SLEEP

From: Arnd Bergmann <[email protected]>

When power management is not enabled in the kernel build, the newly added hibernation changes cause a link failure:

arm-linux-gnueabi-ld: drivers/gpu/drm/amd/amdgpu/amdgpu_drv.o: in function `amdgpu_pmops_thaw':
amdgpu_drv.c:(.text+0x1514): undefined reference to `pm_hibernate_is_recovering'

Make the power management code in this driver conditional on CONFIG_PM and CONFIG_PM_SLEEP

Fixes 530694f54dd5 ("drm/amdgpu: do not resume device in thaw for normal hibernation")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +10 -10
index 021defca9b61..66b5b3260fb9 100644
@@ -2963,15 +2963,15 @@ long amdgpu_drm_ioctl(struct file *filp,
 }
 
 static const struct dev_pm_ops amdgpu_pm_ops = {
-	.prepare = amdgpu_pmops_prepare,
-	.complete = amdgpu_pmops_complete,
-	.suspend = amdgpu_pmops_suspend,
-	.suspend_noirq = amdgpu_pmops_suspend_noirq,
-	.resume = amdgpu_pmops_resume,
-	.freeze = amdgpu_pmops_freeze,
-	.thaw = amdgpu_pmops_thaw,
-	.poweroff = amdgpu_pmops_poweroff,
-	.restore = amdgpu_pmops_restore,
+	.prepare = pm_sleep_ptr(amdgpu_pmops_prepare),
+	.complete = pm_sleep_ptr(amdgpu_pmops_complete),
+	.suspend = pm_sleep_ptr(amdgpu_pmops_suspend),
+	.suspend_noirq = pm_sleep_ptr(amdgpu_pmops_suspend_noirq),
+	.resume = pm_sleep_ptr(amdgpu_pmops_resume),
+	.freeze = pm_sleep_ptr(amdgpu_pmops_freeze),
+	.thaw = pm_sleep_ptr(amdgpu_pmops_thaw),
+	.poweroff = pm_sleep_ptr(amdgpu_pmops_poweroff),
+	.restore = pm_sleep_ptr(amdgpu_pmops_restore),
 	.runtime_suspend = amdgpu_pmops_runtime_suspend,
 	.runtime_resume = amdgpu_pmops_runtime_resume,
 	.runtime_idle = amdgpu_pmops_runtime_idle,
@@ -3116,7 +3116,7 @@ static struct pci_driver amdgpu_kms_pci_driver = {
 	.probe = amdgpu_pci_probe,
 	.remove = amdgpu_pci_remove,
 	.shutdown = amdgpu_pci_shutdown,
-	.driver.pm = &amdgpu_pm_ops,
+	.driver.pm = pm_ptr(&amdgpu_pm_ops),
 	.err_handler = &amdgpu_pci_err_handler,
 	.dev_groups = amdgpu_sysfs_groups,
 };
Signature · 1 line
2.39.5
#1 lore raw
Quoted 5 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When power management is not enabled in the kernel build, the newly added hibernation changes cause a link failure:

Quoted 8 lines

arm-linux-gnueabi-ld: drivers/gpu/drm/amd/amdgpu/amdgpu_drv.o: in function `amdgpu_pmops_thaw':
amdgpu_drv.c:(.text+0x1514): undefined reference to `pm_hibernate_is_recovering'

Make the power management code in this driver conditional on CONFIG_PM and CONFIG_PM_SLEEP

Fixes 530694f54dd5 ("drm/amdgpu: do not resume device in thaw for normal hibernation")

We're going to fix it using this stub instead.

https://lore.kernel.org/linux-pm/[email protected]/

It's in drm-misc-next as of this weekend and it should show up in linux-next in the next day or two.

Quoted 42 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +10 -10
index 021defca9b61..66b5b3260fb9 100644
@@ -2963,15 +2963,15 @@ long amdgpu_drm_ioctl(struct file *filp,
  }
 
  static const struct dev_pm_ops amdgpu_pm_ops = {
-	.prepare = amdgpu_pmops_prepare,
-	.complete = amdgpu_pmops_complete,
-	.suspend = amdgpu_pmops_suspend,
-	.suspend_noirq = amdgpu_pmops_suspend_noirq,
-	.resume = amdgpu_pmops_resume,
-	.freeze = amdgpu_pmops_freeze,
-	.thaw = amdgpu_pmops_thaw,
-	.poweroff = amdgpu_pmops_poweroff,
-	.restore = amdgpu_pmops_restore,
+	.prepare = pm_sleep_ptr(amdgpu_pmops_prepare),
+	.complete = pm_sleep_ptr(amdgpu_pmops_complete),
+	.suspend = pm_sleep_ptr(amdgpu_pmops_suspend),
+	.suspend_noirq = pm_sleep_ptr(amdgpu_pmops_suspend_noirq),
+	.resume = pm_sleep_ptr(amdgpu_pmops_resume),
+	.freeze = pm_sleep_ptr(amdgpu_pmops_freeze),
+	.thaw = pm_sleep_ptr(amdgpu_pmops_thaw),
+	.poweroff = pm_sleep_ptr(amdgpu_pmops_poweroff),
+	.restore = pm_sleep_ptr(amdgpu_pmops_restore),
  	.runtime_suspend = amdgpu_pmops_runtime_suspend,
  	.runtime_resume = amdgpu_pmops_runtime_resume,
  	.runtime_idle = amdgpu_pmops_runtime_idle,
@@ -3116,7 +3116,7 @@ static struct pci_driver amdgpu_kms_pci_driver = {
  	.probe = amdgpu_pci_probe,
  	.remove = amdgpu_pci_remove,
  	.shutdown = amdgpu_pci_shutdown,
-	.driver.pm = &amdgpu_pm_ops,
+	.driver.pm = pm_ptr(&amdgpu_pm_ops),
  	.err_handler = &amdgpu_pci_err_handler,
  	.dev_groups = amdgpu_sysfs_groups,
  };
#2 lore raw
Quoted 15 lines · Mario
Quoted 5 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When power management is not enabled in the kernel build, the newly added hibernation changes cause a link failure:

Quoted 8 lines

arm-linux-gnueabi-ld: drivers/gpu/drm/amd/amdgpu/amdgpu_drv.o: in function `amdgpu_pmops_thaw':
amdgpu_drv.c:(.text+0x1514): undefined reference to `pm_hibernate_is_recovering'

Make the power management code in this driver conditional on CONFIG_PM and CONFIG_PM_SLEEP

Fixes 530694f54dd5 ("drm/amdgpu: do not resume device in thaw for normal hibernation")
Quoted 6 lines

We're going to fix it using this stub instead.

https://lore.kernel.org/linux-pm/[email protected]/

It's in drm-misc-next as of this weekend and it should show up in linux-next in the next day or two.

That patch makes sense as well, but I think mine is useful as an improvement even if it doesn't address a link failure but only reduces the object size by reducing the amount of dead code.

Arnd

Reviewed-by
#3 lore raw
Quoted 20 lines · Arnd Bergmann
Quoted 19 lines · Mario
Quoted 5 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When power management is not enabled in the kernel build, the newly added hibernation changes cause a link failure:

Quoted 8 lines

arm-linux-gnueabi-ld: drivers/gpu/drm/amd/amdgpu/amdgpu_drv.o: in function `amdgpu_pmops_thaw':
amdgpu_drv.c:(.text+0x1514): undefined reference to `pm_hibernate_is_recovering'

Make the power management code in this driver conditional on CONFIG_PM and CONFIG_PM_SLEEP

Fixes 530694f54dd5 ("drm/amdgpu: do not resume device in thaw for normal hibernation")

We're going to fix it using this stub instead.

https://lore.kernel.org/linux-pm/[email protected]/

Quoted 8 lines
Quoted 2 lines

It's in drm-misc-next as of this weekend and it should show up in linux-next in the next day or two.

That patch makes sense as well, but I think mine is useful as an improvement even if it doesn't address a link failure but only reduces the object size by reducing the amount of dead code.

Arnd

Thanks for pointing it out. You're right. I'll get it picked up.

#4 lore raw
Quoted 32 lines · Mario Limonciello
Quoted 31 lines · Arnd Bergmann
Quoted 18 lines · Mario
Quoted 10 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When power management is not enabled in the kernel build, the newly added hibernation changes cause a link failure:

arm-linux-gnueabi-ld: drivers/gpu/drm/amd/amdgpu/amdgpu_drv.o: in function `amdgpu_pmops_thaw':
amdgpu_drv.c:(.text+0x1514): undefined reference to `pm_hibernate_is_recovering'

Quoted 6 lines

Make the power management code in this driver conditional on CONFIG_PM and CONFIG_PM_SLEEP

Fixes 530694f54dd5 ("drm/amdgpu: do not resume device in thaw for

normal hibernation")

Quoted 7 lines

We're going to fix it using this stub instead.

https://lore.kernel.org/linux-pm/20250712233715.821424-1-
[email protected]/

It's in drm-misc-next as of this weekend and it should show up in linux-next in the next day or two.

That patch makes sense as well, but I think mine is useful as an improvement even if it doesn't address a link failure but only reduces the object size by reducing the amount of dead code.

Quoted 5 lines
Quoted 1 line

       Arnd

Thanks for pointing it out.  You're right.  I'll get it picked up.

The internal AMD CI raised a problem on a dGPU (details below). I think that the diff might be a little overzealous, perhaps on the poweroff() callback?

Here is the assertion that got raised.

https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/blob/master/lib/amdgpu/amd_pci_unplug.c#L376

Failed test(s)
==============

igt@amdgpu/amd_pci_unplug@amdgpu_hotunplug_with_exported_bo
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Error message
-------------
Starting subtest: amdgpu_hotunplug_with_exported_bo (amd_pci_unplug:981) amdgpu/amd_pci_unplug-CRITICAL: Test assertion failure function amdgpu_hotunplug_with_exported_bo, file ../lib/amdgpu/amd_pci_unplug.c:344:
(amd_pci_unplug:981) amdgpu/amd_pci_unplug-CRITICAL: Failed assertion: r == 1
(amd_pci_unplug:981) amdgpu/amd_pci_unplug-CRITICAL: Last errno: 2, No such file or directory
(amd_pci_unplug:981) amdgpu/amd_pci_unplug-CRITICAL: error: 0 != 1 Subtest amdgpu_hotunplug_with_exported_bo failed.
**** DEBUG ****
(amd_pci_unplug:981) amdgpu/amd_pci_unplug-CRITICAL: Test assertion failure function amdgpu_hotunplug_with_exported_bo, file ../lib/amdgpu/amd_pci_unplug.c:344:
(amd_pci_unplug:981) amdgpu/amd_pci_unplug-CRITICAL: Failed assertion: r == 1
(amd_pci_unplug:981) amdgpu/amd_pci_unplug-CRITICAL: Last errno: 2, No such file or directory
(amd_pci_unplug:981) amdgpu/amd_pci_unplug-CRITICAL: error: 0 != 1 (amd_pci_unplug:981) igt_core-INFO: Stack trace:
(amd_pci_unplug:981) igt_core-INFO: #0 ../lib/igt_core.c:2075
__igt_fail_assert()
(amd_pci_unplug:981) igt_core-INFO: #1
../lib/amdgpu/amd_pci_unplug.c:377 amdgpu_hotunplug_with_exported_bo()
(amd_pci_unplug:981) igt_core-INFO: #2
../tests/amdgpu/amd_pci_unplug.c:50 __igt_unique____real_main34()
(amd_pci_unplug:981) igt_core-INFO: #3
../tests/amdgpu/amd_pci_unplug.c:34 main()
(amd_pci_unplug:981) igt_core-INFO: #4
../sysdeps/nptl/libc_start_call_main.h:58 __libc_start_call_main()
(amd_pci_unplug:981) igt_core-INFO: #5 ../csu/libc-start.c:128
__libc_start_main@@GLIBC_2.34()
(amd_pci_unplug:981) igt_core-INFO: #6 [_start+0x25]
**** END ****
Subtest amdgpu_hotunplug_with_exported_bo: FAIL (0.033s)

Dmesg output
------------
<6> [701.429516] [IGT] amd_pci_unplug: executing <6> [701.434258] [IGT] amd_pci_unplug: starting subtest amdgpu_hotunplug_with_exported_bo
<6> [701.475508] [IGT] amd_pci_unplug: finished subtest amdgpu_hotunplug_with_exported_bo, FAIL
<6> [701.483839] [IGT] amd_pci_unplug: exiting, ret=98