search for: nouveau_pmops_suspend

https://bugs.freedesktop.org/show_bug.cgi?id=86566 Bug ID: 86566 Summary: [NV96] nouveau_pmops_suspend returns -16 Product: xorg Version: git Hardware: x86-64 (AMD64) OS: Linux (All) Status: NEW Severity: normal Priority: medium Component: Driver/nouveau Assignee: nouveau at lists.freedesktop.org...

...vbios_init(dev); > > if (dev->mode_config.num_crtc) { > NV_INFO(drm, "resuming display...\n"); > @@ -646,6 +651,7 @@ nouveau_do_resume(struct drm_device *dev, bool runtime) > > return 0; > } > +EXPORT_SYMBOL(nouveau_do_resume); > > int > nouveau_pmops_suspend(struct device *dev) > diff --git a/drm/nouveau_drm.h b/drm/nouveau_drm.h > index 8ae36f265fb8..897d295dd1e3 100644 > --- a/drm/nouveau_drm.h > +++ b/drm/nouveau_drm.h > @@ -177,6 +177,8 @@ nouveau_drm(struct drm_device *dev) > > int nouveau_pmops_suspend(struct device *); &g...

...drm/nouveau/nouveau_drm.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/drm/nouveau/nouveau_drm.c b/drm/nouveau/nouveau_drm.c index 8d4a5be3..6e4cb4f7 100644 --- a/drm/nouveau/nouveau_drm.c +++ b/drm/nouveau/nouveau_drm.c @@ -792,6 +792,27 @@ nouveau_pmops_suspend(struct device *dev) return 0; } +static int +nouveau_set_power_state_D0(struct pci_dev *pdev) +{ + struct nouveau_drm *drm = nouveau_drm(pci_get_drvdata(pdev)); + int ret; + + pci_set_power_state(pdev, PCI_D0); + /* abort if anything went wrong */ + if (pdev->current_state != PCI_D0) { + N...

...un_vbios_init(dev); + if (dev->pdev) + nouveau_run_vbios_init(dev); if (dev->mode_config.num_crtc) { NV_INFO(drm, "resuming display...\n"); @@ -646,6 +651,7 @@ nouveau_do_resume(struct drm_device *dev, bool runtime) return 0; } +EXPORT_SYMBOL(nouveau_do_resume); int nouveau_pmops_suspend(struct device *dev) diff --git a/drm/nouveau_drm.h b/drm/nouveau_drm.h index 8ae36f265fb8..897d295dd1e3 100644 --- a/drm/nouveau_drm.h +++ b/drm/nouveau_drm.h @@ -177,6 +177,8 @@ nouveau_drm(struct drm_device *dev) int nouveau_pmops_suspend(struct device *); int nouveau_pmops_resume(struct devi...

...-- >> 1 file changed, 23 insertions(+), 8 deletions(-) >> >> diff --git a/drm/nouveau/nouveau_drm.c b/drm/nouveau/nouveau_drm.c >> index 8d4a5be3..6e4cb4f7 100644 >> --- a/drm/nouveau/nouveau_drm.c >> +++ b/drm/nouveau/nouveau_drm.c >> @@ -792,6 +792,27 @@ nouveau_pmops_suspend(struct device *dev) >> return 0; >> } >> >> +static int >> +nouveau_set_power_state_D0(struct pci_dev *pdev) >> +{ >> + struct nouveau_drm *drm = nouveau_drm(pci_get_drvdata(pdev)); >> + int ret; >> + >> + pci_set_power_...

Does what it says on the label, a lot of these calls are already handled somewhere else and don't appear to be here for a legitimate reason anymore. Lyude Paul (3): drm/nouveau: Remove useless poll_enable() call in switcheroo_set_state() drm/nouveau: Remove useless poll_disable() call in switcheroo_set_state() drm/nouveau: Remove useless poll_enable() call in drm_load()

...mode_config.num_crtc) { >> NV_INFO(drm, "resuming display...\n"); >> @@ -646,6 +651,7 @@ nouveau_do_resume(struct drm_device *dev, bool runtime) >> >> return 0; >> } >> +EXPORT_SYMBOL(nouveau_do_resume); >> >> int >> nouveau_pmops_suspend(struct device *dev) >> diff --git a/drm/nouveau_drm.h b/drm/nouveau_drm.h >> index 8ae36f265fb8..897d295dd1e3 100644 >> --- a/drm/nouveau_drm.h >> +++ b/drm/nouveau_drm.h >> @@ -177,6 +177,8 @@ nouveau_drm(struct drm_device *dev) >> >> int nouveau_pmop...

Next version of https://patchwork.freedesktop.org/series/48131/ Only changes are new A-Bs and R-Bs Lyude Paul (3): drm/nouveau: Remove useless poll_enable() call in switcheroo_set_state() drm/nouveau: Remove useless poll_disable() call in switcheroo_set_state() drm/nouveau: Remove useless poll_enable() call in drm_load() drivers/gpu/drm/nouveau/nouveau_drm.c | 4 +---

...9f7c40] drm_crtc_vblank_off at ffffffffa020c3c0 [drm] #17 [ffffc900039f7cb0] nouveau_display_fini at ffffffffa048a4d6 [nouveau] #18 [ffffc900039f7ce0] nouveau_display_suspend at ffffffffa048ac4f [nouveau] #19 [ffffc900039f7d00] nouveau_do_suspend at ffffffffa047e5ec [nouveau] #20 [ffffc900039f7d38] nouveau_pmops_suspend at ffffffffa047e77d [nouveau] #21 [ffffc900039f7d50] pci_pm_suspend at ffffffff813b1ff0 #22 [ffffc900039f7d80] dpm_run_callback at ffffffff814c4dbd #23 [ffffc900039f7db8] __device_suspend at ffffffff814c5a61 #24 [ffffc900039f7e30] async_suspend at ffffffff814c5cfa #25 [ffffc900039f7e48] async_run_e...

...drm/nouveau/nouveau_drv.h > @@ -212,6 +212,8 @@ struct nouveau_drm { > bool have_disp_power_ref; > > struct dev_pm_domain vga_pm_domain; > + > + struct task_struct *rpm_task; > }; > > static inline struct nouveau_drm * > @@ -231,6 +233,12 @@ int nouveau_pmops_suspend(struct device *); > int nouveau_pmops_resume(struct device *); > bool nouveau_pmops_runtime(void); > > +static inline bool > +nouveau_is_rpm_worker(struct nouveau_drm *drm) > +{ > + return drm->rpm_task == current; > +} > + > #include <nvkm/core/tegra.h&...

...+++++++++++++++++++++-------- > 1 file changed, 23 insertions(+), 8 deletions(-) > > diff --git a/drm/nouveau/nouveau_drm.c b/drm/nouveau/nouveau_drm.c > index 8d4a5be3..6e4cb4f7 100644 > --- a/drm/nouveau/nouveau_drm.c > +++ b/drm/nouveau/nouveau_drm.c > @@ -792,6 +792,27 @@ nouveau_pmops_suspend(struct device *dev) > return 0; > } > > +static int > +nouveau_set_power_state_D0(struct pci_dev *pdev) > +{ > + struct nouveau_drm *drm = nouveau_drm(pci_get_drvdata(pdev)); > + int ret; > + > + pci_set_power_state(pdev, PCI_D0); > + /* abort if anything went...

...[<ffffffff81262a16>] fb_notifier_call_chain+0x16/0x20 [<ffffffff81263146>] fb_set_suspend+0x46/0x60 [<ffffffffa0204da2>] nouveau_fbcon_set_suspend+0x92/0xc0 [nouveau] [<ffffffffa01f5451>] nouveau_do_suspend+0x51/0x200 [nouveau] [<ffffffffa01f564f>] nouveau_pmops_suspend+0x2f/0x80 [nouveau] [<ffffffffa01f723c>] nouveau_switcheroo_set_state+0x5c/0xc0 [nouveau] [<ffffffff81300877>] vga_switchoff+0x17/0x40 [<ffffffff81300f1a>] vga_switcheroo_debugfs_write+0xca/0x380 [<ffffffff8110ec93>] vfs_write+0xa3/0x160 [<ffffffff8110...

...3 insertions(+), 8 deletions(-) > >> > >> diff --git a/drm/nouveau/nouveau_drm.c b/drm/nouveau/nouveau_drm.c > >> index 8d4a5be3..6e4cb4f7 100644 > >> --- a/drm/nouveau/nouveau_drm.c > >> +++ b/drm/nouveau/nouveau_drm.c > >> @@ -792,6 +792,27 @@ nouveau_pmops_suspend(struct device *dev) > >> return 0; > >> } > >> > >> +static int > >> +nouveau_set_power_state_D0(struct pci_dev *pdev) > >> +{ > >> + struct nouveau_drm *drm = nouveau_drm(pci_get_drvdata(pdev)); > >> + int ret;...

...ank_off at ffffffffa020c3c0 [drm] > #17 [ffffc900039f7cb0] nouveau_display_fini at ffffffffa048a4d6 [nouveau] > #18 [ffffc900039f7ce0] nouveau_display_suspend at ffffffffa048ac4f [nouveau] > #19 [ffffc900039f7d00] nouveau_do_suspend at ffffffffa047e5ec [nouveau] > #20 [ffffc900039f7d38] nouveau_pmops_suspend at ffffffffa047e77d [nouveau] > #21 [ffffc900039f7d50] pci_pm_suspend at ffffffff813b1ff0 > #22 [ffffc900039f7d80] dpm_run_callback at ffffffff814c4dbd > #23 [ffffc900039f7db8] __device_suspend at ffffffff814c5a61 > #24 [ffffc900039f7e30] async_suspend at ffffffff814c5cfa > #25 [ffff...

...[<ffffffffa0159be5>] nouveau_event_put+0x35/0x50 [nouveau] [<ffffffffa01c54be>] nouveau_display_fini+0x8e/0xc0 [nouveau] [<ffffffffa01c5afd>] nouveau_display_suspend+0x1d/0xe0 [nouveau] [<ffffffffa01b3bfd>] nouveau_do_suspend+0x23d/0x2d0 [nouveau] [<ffffffffa01b3cd6>] nouveau_pmops_suspend+0x46/0xc0 [nouveau] [<ffffffffa01b7404>] nouveau_switcheroo_set_state+0x64/0xc0 [nouveau] [<ffffffff8145bb98>] vga_switchoff.part.2+0x18/0x40 [<ffffffff8145c083>] vga_switcheroo_debugfs_write+0x303/0x3c0 [<ffffffff81195a29>] ? __sb_start_write+0x49/0x100 [<ffffffff812c369...

Here's some fixes for the less important DP AUX issues I mentioned a while back. Lyude Paul (2): drm/dp: Add ->pre/post_transfer() hooks for drm_dp_aux drm/nouveau: Grab an rpm reference before/after DP AUX transactions drivers/gpu/drm/drm_dp_helper.c | 5 ++ drivers/gpu/drm/nouveau/nouveau_connector.c | 36 ++++++++ drivers/gpu/drm/nouveau/nouveau_drm.c | 12 ++-

...4 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -212,6 +212,8 @@ struct nouveau_drm { bool have_disp_power_ref; struct dev_pm_domain vga_pm_domain; + + struct task_struct *rpm_task; }; static inline struct nouveau_drm * @@ -231,6 +233,12 @@ int nouveau_pmops_suspend(struct device *); int nouveau_pmops_resume(struct device *); bool nouveau_pmops_runtime(void); +static inline bool +nouveau_is_rpm_worker(struct nouveau_drm *drm) +{ + return drm->rpm_task == current; +} + #include <nvkm/core/tegra.h> struct drm_device * -- 2.19.1

...; + DRM_DEBUG_DRIVER("... runpm : %d\n", nouveau_runtime_pm); + DRM_DEBUG_DRIVER("... vram_pushbuf : %d\n", nouveau_vram_pushbuf); + DRM_DEBUG_DRIVER("... pstate : %d\n", nouveau_pstate); +} + static const struct dev_pm_ops nouveau_pm_ops = { .suspend = nouveau_pmops_suspend, .resume = nouveau_pmops_resume, @@ -1085,6 +1103,8 @@ EXPORT_SYMBOL(nouveau_platform_device_create_); static int __init nouveau_drm_init(void) { + nouveau_display_options(); + if (nouveau_modeset == -1) { #ifdef CONFIG_VGA_CONSOLE if (vgacon_text_force()) diff --git a/drm/nouveau_fbcon....

...d1500000:0xd15c7c00 suspend failed with -16 nouveau E[ DRM] 0xdddddddd:0xd1500000 suspend failed with -16 nouveau E[ DRM] 0xffffffff:0xdddddddd suspend failed with -16 nouveau E[ DRM] 0xffffffff:0xffffffff suspend failed with -16 nouveau [ DRM] resuming display... pci_pm_suspend(): nouveau_pmops_suspend+0x0/0xb0 [nouveau] returns -16 dpm_run_callback(): pci_pm_suspend+0x0/0x140 returns -16 PM: Device 0000:01:00.0 failed to suspend async: error -16 PM: Some devices failed to suspend, or early wake event detected -- You are receiving this mail because: You are the assignee for the bug. -----------...

...blank_off+0x1d5/0x210 [drm] > [ 321.474152] ? drm_modeset_drop_locks+0x4e/0x60 [drm] > [ 321.474203] nouveau_display_fini+0x56/0xd0 [nouveau] > [ 321.474254] nouveau_display_suspend+0x4f/0x110 [nouveau] > [ 321.474304] nouveau_do_suspend+0x7c/0x1e0 [nouveau] > [ 321.474355] nouveau_pmops_suspend+0x2d/0x70 [nouveau] > [ 321.474358] pci_pm_suspend+0x70/0x130 > [ 321.474360] ? pci_pm_resume+0x90/0x90 > [ 321.474364] dpm_run_callback+0x4d/0x150 > [ 321.474366] __device_suspend+0x121/0x3b0 > [ 321.474369] ? pm_dev_dbg+0x70/0x70 > [ 321.474370] async_suspend+0x1a/0x...