Reviewed-by: Karol Herbst <kherbst@xxxxxxxxxx> On Tue, Aug 7, 2018 at 10:39 PM, Lyude Paul <lyude@xxxxxxxxxx> wrote: > It's not necessary to call these before we call nouveau_do_suspend(). > Ideally; we shouldn't have to call this at all here, but getting that to > work will take a bit more effort. So for the time being, just move this > call after nouveau_do_suspend() to allow us to easily be able to abort > the runtime suspend process in nouveau_do_suspend() > > Signed-off-by: Lyude Paul <lyude@xxxxxxxxxx> > Cc: stable@xxxxxxxxxxxxxxx > Cc: Lukas Wunner <lukas@xxxxxxxxx> > Cc: Karol Herbst <karolherbst@xxxxxxxxx> > --- > drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c > index 04f704b77a3c..5ea8fe992484 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_drm.c > +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c > @@ -833,8 +833,8 @@ nouveau_pmops_runtime_suspend(struct device *dev) > return -EBUSY; > } > > - nouveau_switcheroo_optimus_dsm(); > ret = nouveau_do_suspend(drm_dev, true); > + nouveau_switcheroo_optimus_dsm(); > pci_save_state(pdev); > pci_disable_device(pdev); > pci_ignore_hotplug(pdev); > -- > 2.17.1 > > _______________________________________________ > Nouveau mailing list > Nouveau@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/nouveau
