Commit 7c923844 authored by Karol Herbst's avatar Karol Herbst Committed by Ben Skeggs
Browse files

drm/nouveau/pci: implement pcie speed change for Fermi 

v5: don't set kepler func pointers
v6: fix alignment and line length
parent 5cca4bdc

drivers/gpu/drm/nouveau/nvkm/subdev/pci/gf100.c

+57 −0
Original line number Diff line number Diff line
@@ -29,6 +29,53 @@ gf100_pci_msi_rearm(struct nvkm_pci *pci) 
	nvkm_pci_wr08(pci, 0x0704, 0xff);

}



void

gf100_pcie_set_version(struct nvkm_pci *pci, u8 ver)

{

	struct nvkm_device *device = pci->subdev.device;

	nvkm_mask(device, 0x02241c, 0x1, ver > 1 ? 1 : 0);

}



int

gf100_pcie_version(struct nvkm_pci *pci)

{

	struct nvkm_device *device = pci->subdev.device;

	return (nvkm_rd32(device, 0x02241c) & 0x1) + 1;

}



void

gf100_pcie_set_cap_speed(struct nvkm_pci *pci, bool full_speed)

{

	struct nvkm_device *device = pci->subdev.device;

	nvkm_mask(device, 0x02241c, 0x80, full_speed ? 0x80 : 0x0);

}



int

gf100_pcie_cap_speed(struct nvkm_pci *pci)

{

	struct nvkm_device *device = pci->subdev.device;

	u8 punits_pci_cap_speed = nvkm_rd32(device, 0x02241c) & 0x80;

	if (punits_pci_cap_speed == 0x80)

		return 1;

	return 0;

}



int

gf100_pcie_init(struct nvkm_pci *pci)

{

	bool full_speed = g84_pcie_cur_speed(pci) == NVKM_PCIE_SPEED_5_0;

	gf100_pcie_set_cap_speed(pci, full_speed);

	return 0;

}



int

gf100_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width)

{

	gf100_pcie_set_cap_speed(pci, speed == NVKM_PCIE_SPEED_5_0);

	g84_pcie_set_link_speed(pci, speed);

	return 0;

}



static const struct nvkm_pci_func

gf100_pci_func = {

	.init = g84_pci_init,
@@ -36,6 +83,16 @@ gf100_pci_func = { 
	.wr08 = nv40_pci_wr08,

	.wr32 = nv40_pci_wr32,

	.msi_rearm = gf100_pci_msi_rearm,



	.pcie.init = gf100_pcie_init,

	.pcie.set_link = gf100_pcie_set_link,



	.pcie.max_speed = g84_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 = g94_pcie_version_supported,

};



int

drivers/gpu/drm/nouveau/nvkm/subdev/pci/gf106.c

+10 −0
Original line number Diff line number Diff line
@@ -30,6 +30,16 @@ gf106_pci_func = { 
	.wr08 = nv40_pci_wr08,

	.wr32 = nv40_pci_wr32,

	.msi_rearm = nv40_pci_msi_rearm,



	.pcie.init = gf100_pcie_init,

	.pcie.set_link = gf100_pcie_set_link,



	.pcie.max_speed = g84_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 = g94_pcie_version_supported,

};



int

drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h

+7 −0
Original line number Diff line number Diff line
@@ -46,6 +46,13 @@ int g84_pcie_set_link(struct nvkm_pci *, enum nvkm_pcie_speed, u8); 


int g94_pcie_version_supported(struct nvkm_pci *);



void gf100_pcie_set_version(struct nvkm_pci *, u8);

int gf100_pcie_version(struct nvkm_pci *);

void gf100_pcie_set_cap_speed(struct nvkm_pci *, bool);

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 nvkm_pcie_oneinit(struct nvkm_pci *);

int nvkm_pcie_init(struct nvkm_pci *);

#endif