mirror of
https://github.com/torvalds/linux.git
synced 2024-12-20 10:01:56 +00:00
drm/nouveau/pci: add gk104 variant
v2: change email used in header v4: change Copyright information v5: revert Copyright changes Signed-off-by: Karol Herbst <nouveau@karolherbst.de>
This commit is contained in:
parent
bec4961e2a
commit
28c8060575
@ -35,4 +35,5 @@ int g84_pci_new(struct nvkm_device *, int, struct nvkm_pci **);
|
|||||||
int g94_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 **);
|
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 **);
|
||||||
#endif
|
#endif
|
||||||
|
@ -1669,7 +1669,7 @@ nve4_chipset = {
|
|||||||
.mc = gf100_mc_new,
|
.mc = gf100_mc_new,
|
||||||
.mmu = gf100_mmu_new,
|
.mmu = gf100_mmu_new,
|
||||||
.mxm = nv50_mxm_new,
|
.mxm = nv50_mxm_new,
|
||||||
.pci = g94_pci_new,
|
.pci = gk104_pci_new,
|
||||||
.pmu = gk104_pmu_new,
|
.pmu = gk104_pmu_new,
|
||||||
.therm = gf119_therm_new,
|
.therm = gf119_therm_new,
|
||||||
.timer = nv41_timer_new,
|
.timer = nv41_timer_new,
|
||||||
@ -1706,7 +1706,7 @@ nve6_chipset = {
|
|||||||
.mc = gf100_mc_new,
|
.mc = gf100_mc_new,
|
||||||
.mmu = gf100_mmu_new,
|
.mmu = gf100_mmu_new,
|
||||||
.mxm = nv50_mxm_new,
|
.mxm = nv50_mxm_new,
|
||||||
.pci = g94_pci_new,
|
.pci = gk104_pci_new,
|
||||||
.pmu = gk104_pmu_new,
|
.pmu = gk104_pmu_new,
|
||||||
.therm = gf119_therm_new,
|
.therm = gf119_therm_new,
|
||||||
.timer = nv41_timer_new,
|
.timer = nv41_timer_new,
|
||||||
@ -1743,7 +1743,7 @@ nve7_chipset = {
|
|||||||
.mc = gf100_mc_new,
|
.mc = gf100_mc_new,
|
||||||
.mmu = gf100_mmu_new,
|
.mmu = gf100_mmu_new,
|
||||||
.mxm = nv50_mxm_new,
|
.mxm = nv50_mxm_new,
|
||||||
.pci = g94_pci_new,
|
.pci = gk104_pci_new,
|
||||||
.pmu = gk104_pmu_new,
|
.pmu = gk104_pmu_new,
|
||||||
.therm = gf119_therm_new,
|
.therm = gf119_therm_new,
|
||||||
.timer = nv41_timer_new,
|
.timer = nv41_timer_new,
|
||||||
@ -1804,7 +1804,7 @@ nvf0_chipset = {
|
|||||||
.mc = gf100_mc_new,
|
.mc = gf100_mc_new,
|
||||||
.mmu = gf100_mmu_new,
|
.mmu = gf100_mmu_new,
|
||||||
.mxm = nv50_mxm_new,
|
.mxm = nv50_mxm_new,
|
||||||
.pci = g94_pci_new,
|
.pci = gk104_pci_new,
|
||||||
.pmu = gk110_pmu_new,
|
.pmu = gk110_pmu_new,
|
||||||
.therm = gf119_therm_new,
|
.therm = gf119_therm_new,
|
||||||
.timer = nv41_timer_new,
|
.timer = nv41_timer_new,
|
||||||
@ -1840,7 +1840,7 @@ nvf1_chipset = {
|
|||||||
.mc = gf100_mc_new,
|
.mc = gf100_mc_new,
|
||||||
.mmu = gf100_mmu_new,
|
.mmu = gf100_mmu_new,
|
||||||
.mxm = nv50_mxm_new,
|
.mxm = nv50_mxm_new,
|
||||||
.pci = g94_pci_new,
|
.pci = gk104_pci_new,
|
||||||
.pmu = gk110_pmu_new,
|
.pmu = gk110_pmu_new,
|
||||||
.therm = gf119_therm_new,
|
.therm = gf119_therm_new,
|
||||||
.timer = nv41_timer_new,
|
.timer = nv41_timer_new,
|
||||||
@ -1876,7 +1876,7 @@ nv106_chipset = {
|
|||||||
.mc = gk20a_mc_new,
|
.mc = gk20a_mc_new,
|
||||||
.mmu = gf100_mmu_new,
|
.mmu = gf100_mmu_new,
|
||||||
.mxm = nv50_mxm_new,
|
.mxm = nv50_mxm_new,
|
||||||
.pci = g94_pci_new,
|
.pci = gk104_pci_new,
|
||||||
.pmu = gk208_pmu_new,
|
.pmu = gk208_pmu_new,
|
||||||
.therm = gf119_therm_new,
|
.therm = gf119_therm_new,
|
||||||
.timer = nv41_timer_new,
|
.timer = nv41_timer_new,
|
||||||
@ -1912,7 +1912,7 @@ nv108_chipset = {
|
|||||||
.mc = gk20a_mc_new,
|
.mc = gk20a_mc_new,
|
||||||
.mmu = gf100_mmu_new,
|
.mmu = gf100_mmu_new,
|
||||||
.mxm = nv50_mxm_new,
|
.mxm = nv50_mxm_new,
|
||||||
.pci = g94_pci_new,
|
.pci = gk104_pci_new,
|
||||||
.pmu = gk208_pmu_new,
|
.pmu = gk208_pmu_new,
|
||||||
.therm = gf119_therm_new,
|
.therm = gf119_therm_new,
|
||||||
.timer = nv41_timer_new,
|
.timer = nv41_timer_new,
|
||||||
@ -1948,7 +1948,7 @@ nv117_chipset = {
|
|||||||
.mc = gk20a_mc_new,
|
.mc = gk20a_mc_new,
|
||||||
.mmu = gf100_mmu_new,
|
.mmu = gf100_mmu_new,
|
||||||
.mxm = nv50_mxm_new,
|
.mxm = nv50_mxm_new,
|
||||||
.pci = g94_pci_new,
|
.pci = gk104_pci_new,
|
||||||
.pmu = gm107_pmu_new,
|
.pmu = gm107_pmu_new,
|
||||||
.therm = gm107_therm_new,
|
.therm = gm107_therm_new,
|
||||||
.timer = gk20a_timer_new,
|
.timer = gk20a_timer_new,
|
||||||
@ -1979,7 +1979,7 @@ nv124_chipset = {
|
|||||||
.mc = gk20a_mc_new,
|
.mc = gk20a_mc_new,
|
||||||
.mmu = gf100_mmu_new,
|
.mmu = gf100_mmu_new,
|
||||||
.mxm = nv50_mxm_new,
|
.mxm = nv50_mxm_new,
|
||||||
.pci = g94_pci_new,
|
.pci = gk104_pci_new,
|
||||||
.pmu = gm107_pmu_new,
|
.pmu = gm107_pmu_new,
|
||||||
.timer = gk20a_timer_new,
|
.timer = gk20a_timer_new,
|
||||||
.volt = gk104_volt_new,
|
.volt = gk104_volt_new,
|
||||||
@ -2010,7 +2010,7 @@ nv126_chipset = {
|
|||||||
.mc = gk20a_mc_new,
|
.mc = gk20a_mc_new,
|
||||||
.mmu = gf100_mmu_new,
|
.mmu = gf100_mmu_new,
|
||||||
.mxm = nv50_mxm_new,
|
.mxm = nv50_mxm_new,
|
||||||
.pci = g94_pci_new,
|
.pci = gk104_pci_new,
|
||||||
.pmu = gm107_pmu_new,
|
.pmu = gm107_pmu_new,
|
||||||
.timer = gk20a_timer_new,
|
.timer = gk20a_timer_new,
|
||||||
.volt = gk104_volt_new,
|
.volt = gk104_volt_new,
|
||||||
|
@ -8,3 +8,4 @@ nvkm-y += nvkm/subdev/pci/g84.o
|
|||||||
nvkm-y += nvkm/subdev/pci/g94.o
|
nvkm-y += nvkm/subdev/pci/g94.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
|
||||||
|
39
drivers/gpu/drm/nouveau/nvkm/subdev/pci/gk104.c
Normal file
39
drivers/gpu/drm/nouveau/nvkm/subdev/pci/gk104.c
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2015 Karol Herbst <nouveau@karolherbst.de>
|
||||||
|
*
|
||||||
|
* 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: Karol Herbst <nouveau@karolherbst.de>
|
||||||
|
*/
|
||||||
|
#include "priv.h"
|
||||||
|
|
||||||
|
static const struct nvkm_pci_func
|
||||||
|
gk104_pci_func = {
|
||||||
|
.init = g84_pci_init,
|
||||||
|
.rd32 = nv40_pci_rd32,
|
||||||
|
.wr08 = nv40_pci_wr08,
|
||||||
|
.wr32 = nv40_pci_wr32,
|
||||||
|
.msi_rearm = nv40_pci_msi_rearm,
|
||||||
|
};
|
||||||
|
|
||||||
|
int
|
||||||
|
gk104_pci_new(struct nvkm_device *device, int index, struct nvkm_pci **ppci)
|
||||||
|
{
|
||||||
|
return nvkm_pci_new_(&gk104_pci_func, device, index, ppci);
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user