Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 725af748 authored by Karol Herbst's avatar Karol Herbst Committed by Ben Skeggs
Browse files

drm/nouveau/pci: Rename g94 to g92 



Signed-off-by: default avatarKarol Herbst <karolherbst@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 9f1c4dbd

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

+1 −1
Original line number Diff line number Diff line
@@ -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 nv4c_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 gf106_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

int gk104_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+10 −10
Original line number Diff line number Diff line
@@ -1025,7 +1025,7 @@ nv94_chipset = { 
	.mc = g84_mc_new,

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = g94_pci_new,

	.pci = g92_pci_new,

	.therm = g84_therm_new,

	.timer = nv41_timer_new,

	.volt = nv40_volt_new,
@@ -1057,7 +1057,7 @@ nv96_chipset = { 
	.mc = g84_mc_new,

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = g94_pci_new,

	.pci = g92_pci_new,

	.therm = g84_therm_new,

	.timer = nv41_timer_new,

	.volt = nv40_volt_new,
@@ -1089,7 +1089,7 @@ nv98_chipset = { 
	.mc = g98_mc_new,

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = g94_pci_new,

	.pci = g92_pci_new,

	.therm = g84_therm_new,

	.timer = nv41_timer_new,

	.volt = nv40_volt_new,
@@ -1121,7 +1121,7 @@ nva0_chipset = { 
	.mc = g84_mc_new,

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = g94_pci_new,

	.pci = g92_pci_new,

	.therm = g84_therm_new,

	.timer = nv41_timer_new,

	.volt = nv40_volt_new,
@@ -1153,7 +1153,7 @@ nva3_chipset = { 
	.mc = gt215_mc_new,

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = g94_pci_new,

	.pci = g92_pci_new,

	.pmu = gt215_pmu_new,

	.therm = gt215_therm_new,

	.timer = nv41_timer_new,
@@ -1187,7 +1187,7 @@ nva5_chipset = { 
	.mc = gt215_mc_new,

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = g94_pci_new,

	.pci = g92_pci_new,

	.pmu = gt215_pmu_new,

	.therm = gt215_therm_new,

	.timer = nv41_timer_new,
@@ -1220,7 +1220,7 @@ nva8_chipset = { 
	.mc = gt215_mc_new,

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = g94_pci_new,

	.pci = g92_pci_new,

	.pmu = gt215_pmu_new,

	.therm = gt215_therm_new,

	.timer = nv41_timer_new,
@@ -1253,7 +1253,7 @@ nvaa_chipset = { 
	.mc = g98_mc_new,

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = g94_pci_new,

	.pci = g92_pci_new,

	.therm = g84_therm_new,

	.timer = nv41_timer_new,

	.volt = nv40_volt_new,
@@ -1285,7 +1285,7 @@ nvac_chipset = { 
	.mc = g98_mc_new,

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = g94_pci_new,

	.pci = g92_pci_new,

	.therm = g84_therm_new,

	.timer = nv41_timer_new,

	.volt = nv40_volt_new,
@@ -1317,7 +1317,7 @@ nvaf_chipset = { 
	.mc = gt215_mc_new,

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = g94_pci_new,

	.pci = g92_pci_new,

	.pmu = gt215_pmu_new,

	.therm = gt215_therm_new,

	.timer = nv41_timer_new,

drivers/gpu/drm/nouveau/nvkm/subdev/pci/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ nvkm-y += nvkm/subdev/pci/nv40.o 
nvkm-y += nvkm/subdev/pci/nv46.o

nvkm-y += nvkm/subdev/pci/nv4c.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/gf106.o

nvkm-y += nvkm/subdev/pci/gk104.o

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

+5 −5
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "priv.h"



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)

		return 2;
@@ -32,7 +32,7 @@ g94_pcie_version_supported(struct nvkm_pci *pci) 
}



static const struct nvkm_pci_func

g94_pci_func = {

g92_pci_func = {

	.init = g84_pci_init,

	.rd32 = nv40_pci_rd32,

	.wr08 = nv40_pci_wr08,
@@ -47,11 +47,11 @@ g94_pci_func = { 


	.pcie.set_version = g84_pcie_set_version,

	.pcie.version = g84_pcie_version,

	.pcie.version_supported = g94_pcie_version_supported,

	.pcie.version_supported = g92_pcie_version_supported,

};



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);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ gf100_pci_func = { 


	.pcie.set_version = gf100_pcie_set_version,

	.pcie.version = gf100_pcie_version,

	.pcie.version_supported = g94_pcie_version_supported,

	.pcie.version_supported = g92_pcie_version_supported,

};



int