Reviewed-by: Lyude Paul <lyude@xxxxxxxxxx> for v2
On Fri, 2019-09-13 at 13:33 +0200, Karol Herbst wrote:
> v2: add force disable ASPM func pointer
>
> Signed-off-by: Karol Herbst <kherbst@xxxxxxxxxx>
> Reviewed-by: Lyude Paul <lyude@xxxxxxxxxx> (v1)
> ---
> drm/nouveau/nvkm/subdev/pci/gk104.c | 8 ++++----
> drm/nouveau/nvkm/subdev/pci/gp100.c | 11 +++++++++++
> drm/nouveau/nvkm/subdev/pci/priv.h | 5 +++++
> 3 files changed, 20 insertions(+), 4 deletions(-)
>
> diff --git a/drm/nouveau/nvkm/subdev/pci/gk104.c
> b/drm/nouveau/nvkm/subdev/pci/gk104.c
> index 804ef017f..61c4e76e8 100644
> --- a/drm/nouveau/nvkm/subdev/pci/gk104.c
> +++ b/drm/nouveau/nvkm/subdev/pci/gk104.c
> @@ -25,7 +25,7 @@
>
> #include <subdev/timer.h>
>
> -static int
> +int
> gk104_pcie_version_supported(struct nvkm_pci *pci)
> {
> return (nvkm_rd32(pci->subdev.device, 0x8c1c0) & 0x4) == 0x4 ? 2 : 1;
> @@ -110,7 +110,7 @@ gk104_pcie_lnkctl_speed(struct nvkm_pci *pci)
> return -1;
> }
>
> -static enum nvkm_pcie_speed
> +enum nvkm_pcie_speed
> gk104_pcie_max_speed(struct nvkm_pci *pci)
> {
> u32 max_speed = nvkm_rd32(pci->subdev.device, 0x8c1c0) & 0x300000;
> @@ -156,7 +156,7 @@ gk104_pcie_set_link_speed(struct nvkm_pci *pci, enum
> nvkm_pcie_speed speed)
> return 0;
> }
>
> -static int
> +int
> gk104_pcie_init(struct nvkm_pci * pci)
> {
> enum nvkm_pcie_speed lnkctl_speed, max_speed, cap_speed;
> @@ -188,7 +188,7 @@ gk104_pcie_init(struct nvkm_pci * pci)
> return 0;
> }
>
> -static int
> +int
> gk104_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8
> width)
> {
> struct nvkm_subdev *subdev = &pci->subdev;
> diff --git a/drm/nouveau/nvkm/subdev/pci/gp100.c
> b/drm/nouveau/nvkm/subdev/pci/gp100.c
> index 82c5234a0..163233f16 100644
> --- a/drm/nouveau/nvkm/subdev/pci/gp100.c
> +++ b/drm/nouveau/nvkm/subdev/pci/gp100.c
> @@ -35,6 +35,17 @@ gp100_pci_func = {
> .wr08 = nv40_pci_wr08,
> .wr32 = nv40_pci_wr32,
> .msi_rearm = gp100_pci_msi_rearm,
> +
> + .pcie.init = gk104_pcie_init,
> + .pcie.set_link = gk104_pcie_set_link,
> +
> + .pcie.max_speed = gk104_pcie_max_speed,
> + .pcie.cur_speed = g84_pcie_cur_speed,
> +
> + .pcie.set_version = gf100_pcie_set_version,
> + .pcie.version = gf100_pcie_version,
> + .pcie.version_supported = gk104_pcie_version_supported,
> + .pcie.force_aspm_off = g84_pcie_force_aspm_off,
> };
>
> int
> diff --git a/drm/nouveau/nvkm/subdev/pci/priv.h
> b/drm/nouveau/nvkm/subdev/pci/priv.h
> index c6a9ef330..82c78befa 100644
> --- a/drm/nouveau/nvkm/subdev/pci/priv.h
> +++ b/drm/nouveau/nvkm/subdev/pci/priv.h
> @@ -56,6 +56,11 @@ int gf100_pcie_cap_speed(struct nvkm_pci *);
> int gf100_pcie_init(struct nvkm_pci *);
> int gf100_pcie_set_link(struct nvkm_pci *, enum nvkm_pcie_speed, u8);
>
> +int gk104_pcie_init(struct nvkm_pci *);
> +int gk104_pcie_set_link(struct nvkm_pci *, enum nvkm_pcie_speed, u8 width);
> +enum nvkm_pcie_speed gk104_pcie_max_speed(struct nvkm_pci *);
> +int gk104_pcie_version_supported(struct nvkm_pci *);
> +
> int nvkm_pcie_oneinit(struct nvkm_pci *);
> int nvkm_pcie_init(struct nvkm_pci *);
> #endif
--
Cheers,
Lyude Paul
_______________________________________________
Nouveau mailing list
Nouveau@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/nouveau
