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

drm/nouveau/mmu/gv100: initial support 



VEID support hacked in here, as it's the most convenient place for now.

Will be refined once it's better understood.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -129,4 +129,5 @@ int gm200_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **); 
int gm20b_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int gp100_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int gp10b_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int gv100_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -2408,6 +2408,7 @@ nv140_chipset = { 
	.imem = nv50_instmem_new,

	.ltc = gp102_ltc_new,

	.mc = gp100_mc_new,

	.mmu = gv100_mmu_new,

	.pci = gp100_pci_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,

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

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ nvkm-y += nvkm/subdev/mmu/gm200.o 
nvkm-y += nvkm/subdev/mmu/gm20b.o

nvkm-y += nvkm/subdev/mmu/gp100.o

nvkm-y += nvkm/subdev/mmu/gp10b.o

nvkm-y += nvkm/subdev/mmu/gv100.o



nvkm-y += nvkm/subdev/mmu/mem.o

nvkm-y += nvkm/subdev/mmu/memnv04.o
@@ -31,6 +32,7 @@ nvkm-y += nvkm/subdev/mmu/vmmgm200.o 
nvkm-y += nvkm/subdev/mmu/vmmgm20b.o

nvkm-y += nvkm/subdev/mmu/vmmgp100.o

nvkm-y += nvkm/subdev/mmu/vmmgp10b.o

nvkm-y += nvkm/subdev/mmu/vmmgv100.o



nvkm-y += nvkm/subdev/mmu/umem.o

nvkm-y += nvkm/subdev/mmu/ummu.o

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gv100.c

0 → 100644
+43 −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 "mem.h"

#include "vmm.h"



#include <core/option.h>



#include <nvif/class.h>



static const struct nvkm_mmu_func

gv100_mmu = {

	.dma_bits = 47,

	.mmu = {{ -1, -1, NVIF_CLASS_MMU_GF100}},

	.mem = {{ -1,  0, NVIF_CLASS_MEM_GF100}, gf100_mem_new, gf100_mem_map },

	.vmm = {{ -1, -1, NVIF_CLASS_VMM_GP100}, gv100_vmm_new },

	.kind = gm200_mmu_kind,

	.kind_sys = true,

};



int

gv100_mmu_new(struct nvkm_device *device, int index, struct nvkm_mmu **pmmu)

{

	return nvkm_mmu_new_(&gv100_mmu, device, index, pmmu);

}

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h

+3 −0
Original line number Diff line number Diff line
@@ -236,6 +236,9 @@ int gp100_vmm_new(struct nvkm_mmu *, u64, u64, void *, u32, 
int gp10b_vmm_new(struct nvkm_mmu *, u64, u64, void *, u32,

		  struct lock_class_key *, const char *,

		  struct nvkm_vmm **);

int gv100_vmm_new(struct nvkm_mmu *, u64, u64, void *, u32,

		  struct lock_class_key *, const char *,

		  struct nvkm_vmm **);



#define VMM_PRINT(l,v,p,f,a...) do {                                           \

	struct nvkm_vmm *_vmm = (v);                                           \