search for: nvkm_pcie_fini

...vkm/subdev/pci/base.c > +++ b/drm/nouveau/nvkm/subdev/pci/base.c > @@ -90,6 +90,8 @@ nvkm_pci_fini(struct nvkm_subdev *subdev, bool suspend) > > if (pci->agp.bridge) > nvkm_agp_fini(pci); > + else if (pci_is_pcie(pci->pdev)) > + nvkm_pcie_fini(pci, suspend); > > return 0; > } > diff --git a/drm/nouveau/nvkm/subdev/pci/pcie.c b/drm/nouveau/nvkm/subdev/pci/pcie.c > index b4203ff1a..5cab4a240 100644 > --- a/drm/nouveau/nvkm/subdev/pci/pcie.c > +++ b/drm/nouveau/nvkm/subdev/pci/pcie.c > @@ -23,6 +23,8 @@ >...

...m/subdev/pci/base.c index b6ebee6f..d9fb5a83 100644 --- a/drm/nouveau/nvkm/subdev/pci/base.c +++ b/drm/nouveau/nvkm/subdev/pci/base.c @@ -90,6 +90,8 @@ nvkm_pci_fini(struct nvkm_subdev *subdev, bool suspend) if (pci->agp.bridge) nvkm_agp_fini(pci); + else if (pci_is_pcie(pci->pdev)) + nvkm_pcie_fini(pci); return 0; } diff --git a/drm/nouveau/nvkm/subdev/pci/pcie.c b/drm/nouveau/nvkm/subdev/pci/pcie.c index 727b5d6a..00c07fd8 100644 --- a/drm/nouveau/nvkm/subdev/pci/pcie.c +++ b/drm/nouveau/nvkm/subdev/pci/pcie.c @@ -118,6 +118,14 @@ nvkm_pcie_init(struct nvkm_pci *pci) return 0; } +i...

.../base.c > > > @@ -90,6 +90,8 @@ nvkm_pci_fini(struct nvkm_subdev *subdev, bool suspend) > > > > > > if (pci->agp.bridge) > > > nvkm_agp_fini(pci); > > > + else if (pci_is_pcie(pci->pdev)) > > > + nvkm_pcie_fini(pci, suspend); > > > > > > return 0; > > > } > > > diff --git a/drm/nouveau/nvkm/subdev/pci/pcie.c b/drm/nouveau/nvkm/subdev/pci/pcie.c > > > index b4203ff1a..5cab4a240 100644 > > > --- a/drm/nouveau/nvkm/subdev/pci/pcie.c > > &gt...

...5a83 100644 > --- a/drm/nouveau/nvkm/subdev/pci/base.c > +++ b/drm/nouveau/nvkm/subdev/pci/base.c > @@ -90,6 +90,8 @@ nvkm_pci_fini(struct nvkm_subdev *subdev, bool suspend) > > if (pci->agp.bridge) > nvkm_agp_fini(pci); > + else if (pci_is_pcie(pci->pdev)) > + nvkm_pcie_fini(pci); > > return 0; > } > @@ -100,6 +102,8 @@ nvkm_pci_preinit(struct nvkm_subdev *subdev) > struct nvkm_pci *pci = nvkm_pci(subdev); > if (pci->agp.bridge) > nvkm_agp_preinit(pci); > + else if (pci_is_pcie(pci->pdev)) > + nvkm_pcie_preinit(pci); >...

...m/subdev/pci/base.c index ee2431a7..d9fb5a83 100644 --- a/drm/nouveau/nvkm/subdev/pci/base.c +++ b/drm/nouveau/nvkm/subdev/pci/base.c @@ -90,6 +90,8 @@ nvkm_pci_fini(struct nvkm_subdev *subdev, bool suspend) if (pci->agp.bridge) nvkm_agp_fini(pci); + else if (pci_is_pcie(pci->pdev)) + nvkm_pcie_fini(pci); return 0; } @@ -100,6 +102,8 @@ nvkm_pci_preinit(struct nvkm_subdev *subdev) struct nvkm_pci *pci = nvkm_pci(subdev); if (pci->agp.bridge) nvkm_agp_preinit(pci); + else if (pci_is_pcie(pci->pdev)) + nvkm_pcie_preinit(pci); return 0; } @@ -193,8 +197,9 @@ nvkm_pci_new_(...

not much changed since the last time I sent those patches out, but there are a couple of annoying bug fixes, which users would probably never hit unless they do rmmod/modprobe nouveau cycles. Biggest change is that I force the link to a 8.0 speed rather than the speed the GPU came up with. Also this series depends on the PCIe improvement patches I sent out recently. Karol Herbst (4): pci:

...subdev/pci/base.c index ee2431a78..c9b60ef76 100644 --- a/drm/nouveau/nvkm/subdev/pci/base.c +++ b/drm/nouveau/nvkm/subdev/pci/base.c @@ -90,6 +90,8 @@ nvkm_pci_fini(struct nvkm_subdev *subdev, bool suspend) if (pci->agp.bridge) nvkm_agp_fini(pci); + else if (pci_is_pcie(pci->pdev)) + nvkm_pcie_fini(pci, suspend); return 0; } diff --git a/drm/nouveau/nvkm/subdev/pci/pcie.c b/drm/nouveau/nvkm/subdev/pci/pcie.c index b4203ff1a..5cab4a240 100644 --- a/drm/nouveau/nvkm/subdev/pci/pcie.c +++ b/drm/nouveau/nvkm/subdev/pci/pcie.c @@ -23,6 +23,8 @@ */ #include "priv.h" +#include &l...

...b/drm/nouveau/nvkm/subdev/pci/base.c > > @@ -90,6 +90,8 @@ nvkm_pci_fini(struct nvkm_subdev *subdev, bool suspend) > > > > if (pci->agp.bridge) > > nvkm_agp_fini(pci); > > + else if (pci_is_pcie(pci->pdev)) > > + nvkm_pcie_fini(pci, suspend); > > > > return 0; > > } > > diff --git a/drm/nouveau/nvkm/subdev/pci/pcie.c b/drm/nouveau/nvkm/subdev/pci/pcie.c > > index b4203ff1a..5cab4a240 100644 > > --- a/drm/nouveau/nvkm/subdev/pci/pcie.c > > +++ b/drm/nouveau/nvkm/subdev/pci...

...> +++ b/drm/nouveau/nvkm/subdev/pci/base.c > > @@ -90,6 +90,8 @@ nvkm_pci_fini(struct nvkm_subdev *subdev, bool suspend) > > > > if (pci->agp.bridge) > > nvkm_agp_fini(pci); > > + else if (pci_is_pcie(pci->pdev)) > > + nvkm_pcie_fini(pci); > > > > return 0; > > } > > @@ -100,6 +102,8 @@ nvkm_pci_preinit(struct nvkm_subdev *subdev) > > struct nvkm_pci *pci = nvkm_pci(subdev); > > if (pci->agp.bridge) > > nvkm_agp_preinit(pci); > > + else if (...

...-90,6 +90,8 @@ nvkm_pci_fini(struct nvkm_subdev *subdev, bool suspend) > > > > > > > > if (pci->agp.bridge) > > > > nvkm_agp_fini(pci); > > > > + else if (pci_is_pcie(pci->pdev)) > > > > + nvkm_pcie_fini(pci, suspend); > > > > > > > > return 0; > > > > } > > > > diff --git a/drm/nouveau/nvkm/subdev/pci/pcie.c b/drm/nouveau/nvkm/subdev/pci/pcie.c > > > > index b4203ff1a..5cab4a240 100644 > > > > --- a/drm/nouveau/nvkm/s...

...bdev/pci/base.c > > > @@ -90,6 +90,8 @@ nvkm_pci_fini(struct nvkm_subdev *subdev, bool suspend) > > > > > > if (pci->agp.bridge) > > > nvkm_agp_fini(pci); > > > + else if (pci_is_pcie(pci->pdev)) > > > + nvkm_pcie_fini(pci); > > > > > > return 0; > > > } > > > @@ -100,6 +102,8 @@ nvkm_pci_preinit(struct nvkm_subdev *subdev) > > > struct nvkm_pci *pci = nvkm_pci(subdev); > > > if (pci->agp.bridge) > > > nvkm_agp_prei...

While investigating the runpm issues on my GP107 I noticed that something inside devinit makes runpm break. If Nouveau loads up to the point right before doing devinit, runpm works without any issues, if devinit is ran, not anymore. Out of curiousity I even tried to "bisect" devinit by not running it on vbios provided signed PMU image, but on the devinit parser we have inside Nouveau.

...vkm_pci_fini(struct nvkm_subdev *subdev, bool suspend) > > > > > > > > > > if (pci->agp.bridge) > > > > > nvkm_agp_fini(pci); > > > > > + else if (pci_is_pcie(pci->pdev)) > > > > > + nvkm_pcie_fini(pci); > > > > > > > > > > return 0; > > > > > } > > > > > @@ -100,6 +102,8 @@ nvkm_pci_preinit(struct nvkm_subdev *subdev) > > > > > struct nvkm_pci *pci = nvkm_pci(subdev); > > > > > if (pc...

Signed-off-by: Karol Herbst <kherbst at redhat.com> Reviewed-by: Lyude Paul <lyude at redhat.com> --- drm/nouveau/nvkm/subdev/pci/gk104.c | 8 ++++---- drm/nouveau/nvkm/subdev/pci/gp100.c | 10 ++++++++++ drm/nouveau/nvkm/subdev/pci/priv.h | 5 +++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/drm/nouveau/nvkm/subdev/pci/gk104.c

...> @@ -90,6 +90,8 @@ nvkm_pci_fini(struct nvkm_subdev *subdev, bool suspend) > > > > > > > > if (pci->agp.bridge) > > > > nvkm_agp_fini(pci); > > > > + else if (pci_is_pcie(pci->pdev)) > > > > + nvkm_pcie_fini(pci); > > > > > > > > return 0; > > > > } > > > > @@ -100,6 +102,8 @@ nvkm_pci_preinit(struct nvkm_subdev *subdev) > > > > struct nvkm_pci *pci = nvkm_pci(subdev); > > > > if (pci->agp.bridge) > > &g...

CCing linux-pci and Bjorn Helgaas. Maybe we could get better insights on how a reasonable fix would look like. Anyway, to me this entire issue looks like something which has to be fixed on a PCI level instead of inside a driver, so it makes sense to ask the pci folks if they have any better suggestions. Original cover letter: While investigating the runpm issues on my GP107 I noticed that

...subdev *subdev, bool suspend) > > > > > > > > > > > > if (pci->agp.bridge) > > > > > > nvkm_agp_fini(pci); > > > > > > + else if (pci_is_pcie(pci->pdev)) > > > > > > + nvkm_pcie_fini(pci); > > > > > > > > > > > > return 0; > > > > > > } > > > > > > @@ -100,6 +102,8 @@ nvkm_pci_preinit(struct nvkm_subdev *subdev) > > > > > > struct nvkm_pci *pci = nvkm_pci(subdev); > > &g...

I merged the both series I sent out recently into one bigger one so that it's more obvious on why all of that is needed. Biggest changes since last sent: * reworked the ASPM patch * removed "pci: add nvkm_pcie_get_speed" patch Please test this on Laptops and report back if it either breaks something or doesn't fix runpm. Thanks Karol Herbst (6): pci: disable ASPM before

...end) > > > > > > > > > > > > > > if (pci->agp.bridge) > > > > > > > nvkm_agp_fini(pci); > > > > > > > + else if (pci_is_pcie(pci->pdev)) > > > > > > > + nvkm_pcie_fini(pci); > > > > > > > > > > > > > > return 0; > > > > > > > } > > > > > > > @@ -100,6 +102,8 @@ nvkm_pci_preinit(struct nvkm_subdev *subdev) > > > > > > > struct nvkm_pci *pci = nvkm_...

...> > > > > > > > > if (pci->agp.bridge) > > > > > > > > > nvkm_agp_fini(pci); > > > > > > > > > + else if (pci_is_pcie(pci->pdev)) > > > > > > > > > + nvkm_pcie_fini(pci); > > > > > > > > > > > > > > > > > > return 0; > > > > > > > > > } > > > > > > > > > @@ -100,6 +102,8 @@ nvkm_pci_preinit(struct nvkm_subdev *subdev) > > > > > >...