leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/nouveau/pci: Rename g94 to g92

Browse Source 
Signed-off-by: Karol Herbst <karolherbst@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Karol Herbst 2016-11-20 00:43:14 +01:00 committed by Ben Skeggs
parent 9f1c4dbd3d
commit 725af74826
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h
View File

@ -43,7 +43,7 @@ int nv40_pci_new(struct nvkm_device *, int, struct nvkm_pci **);
int nv46_pci_new(struct nvkm_device *, int, struct nvkm_pci **); int nv46_pci_new(struct nvkm_device *, int, struct nvkm_pci **);
int nv4c_pci_new(struct nvkm_device *, int, struct nvkm_pci **); int nv4c_pci_new(struct nvkm_device *, int, struct nvkm_pci **);
int g84_pci_new(struct nvkm_device *, int, struct nvkm_pci **); int g84_pci_new(struct nvkm_device *, int, struct nvkm_pci **);
int g94_pci_new(struct nvkm_device *, int, struct nvkm_pci **); int g92_pci_new(struct nvkm_device *, int, struct nvkm_pci **);
int gf100_pci_new(struct nvkm_device *, int, struct nvkm_pci **); int gf100_pci_new(struct nvkm_device *, int, struct nvkm_pci **);
int gf106_pci_new(struct nvkm_device *, int, struct nvkm_pci **); int gf106_pci_new(struct nvkm_device *, int, struct nvkm_pci **);
int gk104_pci_new(struct nvkm_device *, int, struct nvkm_pci **); int gk104_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

20
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
View File

@ -1025,7 +1025,7 @@ nv94_chipset = {
.mc = g84_mc_new, .mc = g84_mc_new,
.mmu = nv50_mmu_new, .mmu = nv50_mmu_new,
.mxm = nv50_mxm_new, .mxm = nv50_mxm_new,
.pci = g94_pci_new, .pci = g92_pci_new,
.therm = g84_therm_new, .therm = g84_therm_new,
.timer = nv41_timer_new, .timer = nv41_timer_new,
.volt = nv40_volt_new, .volt = nv40_volt_new,
@ -1057,7 +1057,7 @@ nv96_chipset = {
.mc = g84_mc_new, .mc = g84_mc_new,
.mmu = nv50_mmu_new, .mmu = nv50_mmu_new,
.mxm = nv50_mxm_new, .mxm = nv50_mxm_new,
.pci = g94_pci_new, .pci = g92_pci_new,
.therm = g84_therm_new, .therm = g84_therm_new,
.timer = nv41_timer_new, .timer = nv41_timer_new,
.volt = nv40_volt_new, .volt = nv40_volt_new,
@ -1089,7 +1089,7 @@ nv98_chipset = {
.mc = g98_mc_new, .mc = g98_mc_new,
.mmu = nv50_mmu_new, .mmu = nv50_mmu_new,
.mxm = nv50_mxm_new, .mxm = nv50_mxm_new,
.pci = g94_pci_new, .pci = g92_pci_new,
.therm = g84_therm_new, .therm = g84_therm_new,
.timer = nv41_timer_new, .timer = nv41_timer_new,
.volt = nv40_volt_new, .volt = nv40_volt_new,
@ -1121,7 +1121,7 @@ nva0_chipset = {
.mc = g84_mc_new, .mc = g84_mc_new,
.mmu = nv50_mmu_new, .mmu = nv50_mmu_new,
.mxm = nv50_mxm_new, .mxm = nv50_mxm_new,
.pci = g94_pci_new, .pci = g92_pci_new,
.therm = g84_therm_new, .therm = g84_therm_new,
.timer = nv41_timer_new, .timer = nv41_timer_new,
.volt = nv40_volt_new, .volt = nv40_volt_new,
@ -1153,7 +1153,7 @@ nva3_chipset = {
.mc = gt215_mc_new, .mc = gt215_mc_new,
.mmu = nv50_mmu_new, .mmu = nv50_mmu_new,
.mxm = nv50_mxm_new, .mxm = nv50_mxm_new,
.pci = g94_pci_new, .pci = g92_pci_new,
.pmu = gt215_pmu_new, .pmu = gt215_pmu_new,
.therm = gt215_therm_new, .therm = gt215_therm_new,
.timer = nv41_timer_new, .timer = nv41_timer_new,
@ -1187,7 +1187,7 @@ nva5_chipset = {
.mc = gt215_mc_new, .mc = gt215_mc_new,
.mmu = nv50_mmu_new, .mmu = nv50_mmu_new,
.mxm = nv50_mxm_new, .mxm = nv50_mxm_new,
.pci = g94_pci_new, .pci = g92_pci_new,
.pmu = gt215_pmu_new, .pmu = gt215_pmu_new,
.therm = gt215_therm_new, .therm = gt215_therm_new,
.timer = nv41_timer_new, .timer = nv41_timer_new,
@ -1220,7 +1220,7 @@ nva8_chipset = {
.mc = gt215_mc_new, .mc = gt215_mc_new,
.mmu = nv50_mmu_new, .mmu = nv50_mmu_new,
.mxm = nv50_mxm_new, .mxm = nv50_mxm_new,
.pci = g94_pci_new, .pci = g92_pci_new,
.pmu = gt215_pmu_new, .pmu = gt215_pmu_new,
.therm = gt215_therm_new, .therm = gt215_therm_new,
.timer = nv41_timer_new, .timer = nv41_timer_new,
@ -1253,7 +1253,7 @@ nvaa_chipset = {
.mc = g98_mc_new, .mc = g98_mc_new,
.mmu = nv50_mmu_new, .mmu = nv50_mmu_new,
.mxm = nv50_mxm_new, .mxm = nv50_mxm_new,
.pci = g94_pci_new, .pci = g92_pci_new,
.therm = g84_therm_new, .therm = g84_therm_new,
.timer = nv41_timer_new, .timer = nv41_timer_new,
.volt = nv40_volt_new, .volt = nv40_volt_new,
@ -1285,7 +1285,7 @@ nvac_chipset = {
.mc = g98_mc_new, .mc = g98_mc_new,
.mmu = nv50_mmu_new, .mmu = nv50_mmu_new,
.mxm = nv50_mxm_new, .mxm = nv50_mxm_new,
.pci = g94_pci_new, .pci = g92_pci_new,
.therm = g84_therm_new, .therm = g84_therm_new,
.timer = nv41_timer_new, .timer = nv41_timer_new,
.volt = nv40_volt_new, .volt = nv40_volt_new,
@ -1317,7 +1317,7 @@ nvaf_chipset = {
.mc = gt215_mc_new, .mc = gt215_mc_new,
.mmu = nv50_mmu_new, .mmu = nv50_mmu_new,
.mxm = nv50_mxm_new, .mxm = nv50_mxm_new,
.pci = g94_pci_new, .pci = g92_pci_new,
.pmu = gt215_pmu_new, .pmu = gt215_pmu_new,
.therm = gt215_therm_new, .therm = gt215_therm_new,
.timer = nv41_timer_new, .timer = nv41_timer_new,

2
drivers/gpu/drm/nouveau/nvkm/subdev/pci/Kbuild
View File

@ -6,7 +6,7 @@ nvkm-y += nvkm/subdev/pci/nv40.o
nvkm-y += nvkm/subdev/pci/nv46.o nvkm-y += nvkm/subdev/pci/nv46.o
nvkm-y += nvkm/subdev/pci/nv4c.o nvkm-y += nvkm/subdev/pci/nv4c.o
nvkm-y += nvkm/subdev/pci/g84.o nvkm-y += nvkm/subdev/pci/g84.o
nvkm-y += nvkm/subdev/pci/g94.o nvkm-y += nvkm/subdev/pci/g92.o
nvkm-y += nvkm/subdev/pci/gf100.o nvkm-y += nvkm/subdev/pci/gf100.o
nvkm-y += nvkm/subdev/pci/gf106.o nvkm-y += nvkm/subdev/pci/gf106.o
nvkm-y += nvkm/subdev/pci/gk104.o nvkm-y += nvkm/subdev/pci/gk104.o

10
drivers/gpu/drm/nouveau/nvkm/subdev/pci/g94.c → drivers/gpu/drm/nouveau/nvkm/subdev/pci/g92.c
View File

@ -24,7 +24,7 @@
#include "priv.h" #include "priv.h"
int int
g94_pcie_version_supported(struct nvkm_pci *pci) g92_pcie_version_supported(struct nvkm_pci *pci)
{ {
if ((nvkm_pci_rd32(pci, 0x460) & 0x200) == 0x200) if ((nvkm_pci_rd32(pci, 0x460) & 0x200) == 0x200)
return 2; return 2;
@ -32,7 +32,7 @@ g94_pcie_version_supported(struct nvkm_pci *pci)
} }
static const struct nvkm_pci_func static const struct nvkm_pci_func
g94_pci_func = { g92_pci_func = {
.init = g84_pci_init, .init = g84_pci_init,
.rd32 = nv40_pci_rd32, .rd32 = nv40_pci_rd32,
.wr08 = nv40_pci_wr08, .wr08 = nv40_pci_wr08,
@ -47,11 +47,11 @@ g94_pci_func = {
.pcie.set_version = g84_pcie_set_version, .pcie.set_version = g84_pcie_set_version,
.pcie.version = g84_pcie_version, .pcie.version = g84_pcie_version,
.pcie.version_supported = g94_pcie_version_supported, .pcie.version_supported = g92_pcie_version_supported,
}; };
int int
g94_pci_new(struct nvkm_device *device, int index, struct nvkm_pci **ppci) g92_pci_new(struct nvkm_device *device, int index, struct nvkm_pci **ppci)
{ {
return nvkm_pci_new_(&g94_pci_func, device, index, ppci); return nvkm_pci_new_(&g92_pci_func, device, index, ppci);
} }

2
drivers/gpu/drm/nouveau/nvkm/subdev/pci/gf100.c
View File

@ -92,7 +92,7 @@ gf100_pci_func = {
.pcie.set_version = gf100_pcie_set_version, .pcie.set_version = gf100_pcie_set_version,
.pcie.version = gf100_pcie_version, .pcie.version = gf100_pcie_version,
.pcie.version_supported = g94_pcie_version_supported, .pcie.version_supported = g92_pcie_version_supported,
}; };
int int

2
drivers/gpu/drm/nouveau/nvkm/subdev/pci/gf106.c
View File

@ -39,7 +39,7 @@ gf106_pci_func = {
.pcie.set_version = gf100_pcie_set_version, .pcie.set_version = gf100_pcie_set_version,
.pcie.version = gf100_pcie_version, .pcie.version = gf100_pcie_version,
.pcie.version_supported = g94_pcie_version_supported, .pcie.version_supported = g92_pcie_version_supported,
}; };
int int

2
drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h
View File

@ -44,7 +44,7 @@ enum nvkm_pcie_speed g84_pcie_max_speed(struct nvkm_pci *);
int g84_pcie_init(struct nvkm_pci *); int g84_pcie_init(struct nvkm_pci *);
int g84_pcie_set_link(struct nvkm_pci *, enum nvkm_pcie_speed, u8); int g84_pcie_set_link(struct nvkm_pci *, enum nvkm_pcie_speed, u8);
int g94_pcie_version_supported(struct nvkm_pci *); int g92_pcie_version_supported(struct nvkm_pci *);
void gf100_pcie_set_version(struct nvkm_pci *, u8); void gf100_pcie_set_version(struct nvkm_pci *, u8);
int gf100_pcie_version(struct nvkm_pci *); int gf100_pcie_version(struct nvkm_pci *);