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

Commit b31505c4 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/pci/g94: split implementation from nv40 



An upcoming patch will implement functionality that we don't use on any
NV40 chipset.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 3e55b53b

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

+1 −0
Original line number Diff line number Diff line
@@ -31,5 +31,6 @@ int nv40_pci_new(struct nvkm_device *, int, struct nvkm_pci **); 
int nv4c_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

int nv50_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 gf100_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

#endif

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

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

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.therm = g84_therm_new,

	.timer = nv41_timer_new,

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

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_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 = nv40_pci_new,

	.pci = g94_pci_new,

	.therm = g84_therm_new,

	.timer = nv41_timer_new,

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

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.therm = g84_therm_new,

	.timer = nv41_timer_new,

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

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gt215_pmu_new,

	.therm = gt215_therm_new,

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

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gt215_pmu_new,

	.therm = gt215_therm_new,

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

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_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 = nv40_pci_new,

	.pci = g94_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 = nv40_pci_new,

	.pci = g94_pci_new,

	.therm = g84_therm_new,

	.timer = nv41_timer_new,

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

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gt215_pmu_new,

	.therm = gt215_therm_new,

	.timer = nv41_timer_new,
@@ -1388,7 +1388,7 @@ nvc1_chipset = { 
	.mc = gf100_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gf100_pmu_new,

	.therm = gt215_therm_new,

	.timer = nv41_timer_new,
@@ -1423,7 +1423,7 @@ nvc3_chipset = { 
	.mc = gf100_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gf100_pmu_new,

	.therm = gt215_therm_new,

	.timer = nv41_timer_new,
@@ -1566,7 +1566,7 @@ nvcf_chipset = { 
	.mc = gf100_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gf100_pmu_new,

	.therm = gt215_therm_new,

	.timer = nv41_timer_new,
@@ -1601,7 +1601,7 @@ nvd7_chipset = { 
	.mc = gf100_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.therm = gf119_therm_new,

	.timer = nv41_timer_new,

	.ce[0] = gf100_ce_new,
@@ -1634,7 +1634,7 @@ nvd9_chipset = { 
	.mc = gf100_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gf119_pmu_new,

	.therm = gf119_therm_new,

	.timer = nv41_timer_new,
@@ -1669,7 +1669,7 @@ nve4_chipset = { 
	.mc = gf100_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gk104_pmu_new,

	.therm = gf119_therm_new,

	.timer = nv41_timer_new,
@@ -1706,7 +1706,7 @@ nve6_chipset = { 
	.mc = gf100_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gk104_pmu_new,

	.therm = gf119_therm_new,

	.timer = nv41_timer_new,
@@ -1743,7 +1743,7 @@ nve7_chipset = { 
	.mc = gf100_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gf119_pmu_new,

	.therm = gf119_therm_new,

	.timer = nv41_timer_new,
@@ -1804,7 +1804,7 @@ nvf0_chipset = { 
	.mc = gf100_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gk110_pmu_new,

	.therm = gf119_therm_new,

	.timer = nv41_timer_new,
@@ -1840,7 +1840,7 @@ nvf1_chipset = { 
	.mc = gf100_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gk110_pmu_new,

	.therm = gf119_therm_new,

	.timer = nv41_timer_new,
@@ -1876,7 +1876,7 @@ nv106_chipset = { 
	.mc = gk20a_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gk208_pmu_new,

	.therm = gf119_therm_new,

	.timer = nv41_timer_new,
@@ -1912,7 +1912,7 @@ nv108_chipset = { 
	.mc = gk20a_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gk208_pmu_new,

	.therm = gf119_therm_new,

	.timer = nv41_timer_new,
@@ -1948,7 +1948,7 @@ nv117_chipset = { 
	.mc = gk20a_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gm107_pmu_new,

	.therm = gm107_therm_new,

	.timer = gk20a_timer_new,
@@ -1979,7 +1979,7 @@ nv124_chipset = { 
	.mc = gk20a_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gm107_pmu_new,

	.timer = gk20a_timer_new,

	.volt = gk104_volt_new,
@@ -2010,7 +2010,7 @@ nv126_chipset = { 
	.mc = gk20a_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv40_pci_new,

	.pci = g94_pci_new,

	.pmu = gm107_pmu_new,

	.timer = gk20a_timer_new,

	.volt = gk104_volt_new,

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

+1 −0
Original line number Diff line number Diff line
@@ -5,4 +5,5 @@ nvkm-y += nvkm/subdev/pci/nv40.o 
nvkm-y += nvkm/subdev/pci/nv4c.o

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

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

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

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

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

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2015 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: Ben Skeggs <bskeggs@redhat.com>

 */

#include "priv.h"



static const struct nvkm_pci_func

g94_pci_func = {

	.rd32 = nv40_pci_rd32,

	.wr08 = nv40_pci_wr08,

	.wr32 = nv40_pci_wr32,

	.msi_rearm = nv40_pci_msi_rearm,

};



int

g94_pci_new(struct nvkm_device *device, int index, struct nvkm_pci **ppci)

{

	return nvkm_pci_new_(&g94_pci_func, device, index, ppci);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ nv40_pci_wr32(struct nvkm_pci *pci, u16 addr, u32 data) 
	nvkm_wr32(device, 0x088000 + addr, data);

}



static void

void

nv40_pci_msi_rearm(struct nvkm_pci *pci)

{

	nvkm_pci_wr08(pci, 0x0068, 0xff);