Re: [PATCH] Revert "nouveau: pci: quiesce GPU on shutdown"

From: Marek Vasut

Date: Sun Nov 15 2026 - 20:20:24 EST


On 11/14/26 5:20 PM, Uwe Kleine-König wrote:

[...]

-static void
-nouveau_drm_shutdown(struct pci_dev *pdev)
-{
- struct nouveau_drm *drm = pci_get_drvdata(pdev);
- int ret;
-
- if (!drm)
- return;
-
- if (drm->dev->switch_power_state == DRM_SWITCH_POWER_OFF ||
- drm->dev->switch_power_state == DRM_SWITCH_POWER_DYNAMIC_OFF)
- return;
-
- ret = nouveau_do_suspend(drm, false);
- if (ret)
- NV_ERROR(drm, "shutdown suspend failed with: %d\n", ret);
-
- pci_save_state(pdev);
- pci_disable_device(pdev);
- pci_set_power_state(pdev, PCI_D3hot);
- /*
- * This is just to give the pci power transition time to settle
- * before an immediate kexec jump. it’s mirroring the existing
- * nouveau_pmops_suspend() behavior, which already does
- * udelay(200) right after pci_set_power_state(..., pci_d3hot). In
- * ->shutdown() we’re allowed to sleep, so I used usleep_range()
- * instead of a busy-wait udelay().
- */
- usleep_range(200, 400);
-}
-

I cannot reproduce it

I can surely reproduce it, because since Linux 7.1 I cannot shut down my computer, something which worked since the beginning.

, but maybe it's helpful to find out where/how the
driver hangs. Adding printks might be enough, and if not, remove stuff
from nouveau_drm_shutdown() until it works.

The laptop screen goes off, the machine is unresponsive this late during shutdown, so adding printks() does not help.

I'd guess this gives the
needed insights to determine a fix without reverting the identified
commit.
The problematic commit should be reverted and reworked, since it breaks existing users. I am open to testing patches on that machine.