Loading drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h +1 −0 Original line number Diff line number Diff line Loading @@ -29,4 +29,5 @@ int gf100_bar_new(struct nvkm_device *, int, struct nvkm_bar **); int gk20a_bar_new(struct nvkm_device *, int, struct nvkm_bar **); int gm107_bar_new(struct nvkm_device *, int, struct nvkm_bar **); int gm20b_bar_new(struct nvkm_device *, int, struct nvkm_bar **); int tu104_bar_new(struct nvkm_device *, int, struct nvkm_bar **); #endif drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +1 −0 Original line number Diff line number Diff line Loading @@ -2437,6 +2437,7 @@ nv140_chipset = { static const struct nvkm_device_chip nv164_chipset = { .name = "TU104", .bar = tu104_bar_new, .bios = nvkm_bios_new, .bus = gf100_bus_new, .devinit = tu104_devinit_new, Loading drivers/gpu/drm/nouveau/nvkm/subdev/bar/Kbuild +1 −0 Original line number Diff line number Diff line Loading @@ -5,3 +5,4 @@ nvkm-y += nvkm/subdev/bar/gf100.o nvkm-y += nvkm/subdev/bar/gk20a.o nvkm-y += nvkm/subdev/bar/gm107.o nvkm-y += nvkm/subdev/bar/gm20b.o nvkm-y += nvkm/subdev/bar/tu104.o drivers/gpu/drm/nouveau/nvkm/subdev/bar/tu104.c 0 → 100644 +98 −0 Original line number Diff line number Diff line /* * Copyright 2018 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. */ #include "gf100.h" #include <core/memory.h> #include <subdev/timer.h> static void tu104_bar_bar2_wait(struct nvkm_bar *bar) { struct nvkm_device *device = bar->subdev.device; nvkm_msec(device, 2000, if (!(nvkm_rd32(device, 0xb80f50) & 0x0000000c)) break; ); } static void tu104_bar_bar2_fini(struct nvkm_bar *bar) { nvkm_mask(bar->subdev.device, 0xb80f48, 0x80000000, 0x00000000); } static void tu104_bar_bar2_init(struct nvkm_bar *base) { struct nvkm_device *device = base->subdev.device; struct gf100_bar *bar = gf100_bar(base); u32 addr = nvkm_memory_addr(bar->bar[0].inst) >> 12; if (bar->bar2_halve) addr |= 0x40000000; nvkm_wr32(device, 0xb80f48, 0x80000000 | addr); } static void tu104_bar_bar1_wait(struct nvkm_bar *bar) { struct nvkm_device *device = bar->subdev.device; nvkm_msec(device, 2000, if (!(nvkm_rd32(device, 0xb80f50) & 0x00000003)) break; ); } static void tu104_bar_bar1_fini(struct nvkm_bar *bar) { nvkm_mask(bar->subdev.device, 0xb80f40, 0x80000000, 0x00000000); } static void tu104_bar_bar1_init(struct nvkm_bar *base) { struct nvkm_device *device = base->subdev.device; struct gf100_bar *bar = gf100_bar(base); const u32 addr = nvkm_memory_addr(bar->bar[1].inst) >> 12; nvkm_wr32(device, 0xb80f40, 0x80000000 | addr); } static const struct nvkm_bar_func tu104_bar = { .dtor = gf100_bar_dtor, .oneinit = gf100_bar_oneinit, .bar1.init = tu104_bar_bar1_init, .bar1.fini = tu104_bar_bar1_fini, .bar1.wait = tu104_bar_bar1_wait, .bar1.vmm = gf100_bar_bar1_vmm, .bar2.init = tu104_bar_bar2_init, .bar2.fini = tu104_bar_bar2_fini, .bar2.wait = tu104_bar_bar2_wait, .bar2.vmm = gf100_bar_bar2_vmm, .flush = g84_bar_flush, }; int tu104_bar_new(struct nvkm_device *device, int index, struct nvkm_bar **pbar) { return gf100_bar_new_(&tu104_bar, device, index, pbar); } Loading
drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h +1 −0 Original line number Diff line number Diff line Loading @@ -29,4 +29,5 @@ int gf100_bar_new(struct nvkm_device *, int, struct nvkm_bar **); int gk20a_bar_new(struct nvkm_device *, int, struct nvkm_bar **); int gm107_bar_new(struct nvkm_device *, int, struct nvkm_bar **); int gm20b_bar_new(struct nvkm_device *, int, struct nvkm_bar **); int tu104_bar_new(struct nvkm_device *, int, struct nvkm_bar **); #endif
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +1 −0 Original line number Diff line number Diff line Loading @@ -2437,6 +2437,7 @@ nv140_chipset = { static const struct nvkm_device_chip nv164_chipset = { .name = "TU104", .bar = tu104_bar_new, .bios = nvkm_bios_new, .bus = gf100_bus_new, .devinit = tu104_devinit_new, Loading
drivers/gpu/drm/nouveau/nvkm/subdev/bar/Kbuild +1 −0 Original line number Diff line number Diff line Loading @@ -5,3 +5,4 @@ nvkm-y += nvkm/subdev/bar/gf100.o nvkm-y += nvkm/subdev/bar/gk20a.o nvkm-y += nvkm/subdev/bar/gm107.o nvkm-y += nvkm/subdev/bar/gm20b.o nvkm-y += nvkm/subdev/bar/tu104.o
drivers/gpu/drm/nouveau/nvkm/subdev/bar/tu104.c 0 → 100644 +98 −0 Original line number Diff line number Diff line /* * Copyright 2018 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. */ #include "gf100.h" #include <core/memory.h> #include <subdev/timer.h> static void tu104_bar_bar2_wait(struct nvkm_bar *bar) { struct nvkm_device *device = bar->subdev.device; nvkm_msec(device, 2000, if (!(nvkm_rd32(device, 0xb80f50) & 0x0000000c)) break; ); } static void tu104_bar_bar2_fini(struct nvkm_bar *bar) { nvkm_mask(bar->subdev.device, 0xb80f48, 0x80000000, 0x00000000); } static void tu104_bar_bar2_init(struct nvkm_bar *base) { struct nvkm_device *device = base->subdev.device; struct gf100_bar *bar = gf100_bar(base); u32 addr = nvkm_memory_addr(bar->bar[0].inst) >> 12; if (bar->bar2_halve) addr |= 0x40000000; nvkm_wr32(device, 0xb80f48, 0x80000000 | addr); } static void tu104_bar_bar1_wait(struct nvkm_bar *bar) { struct nvkm_device *device = bar->subdev.device; nvkm_msec(device, 2000, if (!(nvkm_rd32(device, 0xb80f50) & 0x00000003)) break; ); } static void tu104_bar_bar1_fini(struct nvkm_bar *bar) { nvkm_mask(bar->subdev.device, 0xb80f40, 0x80000000, 0x00000000); } static void tu104_bar_bar1_init(struct nvkm_bar *base) { struct nvkm_device *device = base->subdev.device; struct gf100_bar *bar = gf100_bar(base); const u32 addr = nvkm_memory_addr(bar->bar[1].inst) >> 12; nvkm_wr32(device, 0xb80f40, 0x80000000 | addr); } static const struct nvkm_bar_func tu104_bar = { .dtor = gf100_bar_dtor, .oneinit = gf100_bar_oneinit, .bar1.init = tu104_bar_bar1_init, .bar1.fini = tu104_bar_bar1_fini, .bar1.wait = tu104_bar_bar1_wait, .bar1.vmm = gf100_bar_bar1_vmm, .bar2.init = tu104_bar_bar2_init, .bar2.fini = tu104_bar_bar2_fini, .bar2.wait = tu104_bar_bar2_wait, .bar2.vmm = gf100_bar_bar2_vmm, .flush = g84_bar_flush, }; int tu104_bar_new(struct nvkm_device *device, int index, struct nvkm_bar **pbar) { return gf100_bar_new_(&tu104_bar, device, index, pbar); }
Ben Skeggs <bskeggs@redhat.com>Ben Skeggs <bskeggs@redhat.com>