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

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

drm/nouveau/mmu/gm200: fork from gf100 



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

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

+1 −0
Original line number Diff line number Diff line
@@ -71,4 +71,5 @@ int g84_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **); 
int gf100_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

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

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

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

#endif

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

+3 −3
Original line number Diff line number Diff line
@@ -2039,7 +2039,7 @@ nv120_chipset = { 
	.imem = nv50_instmem_new,

	.ltc = gm200_ltc_new,

	.mc = gk20a_mc_new,

	.mmu = gf100_mmu_new,

	.mmu = gm200_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,

	.pmu = gm107_pmu_new,
@@ -2074,7 +2074,7 @@ nv124_chipset = { 
	.imem = nv50_instmem_new,

	.ltc = gm200_ltc_new,

	.mc = gk20a_mc_new,

	.mmu = gf100_mmu_new,

	.mmu = gm200_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,

	.pmu = gm107_pmu_new,
@@ -2109,7 +2109,7 @@ nv126_chipset = { 
	.imem = nv50_instmem_new,

	.ltc = gm200_ltc_new,

	.mc = gk20a_mc_new,

	.mmu = gf100_mmu_new,

	.mmu = gm200_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,

	.pmu = gm107_pmu_new,

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

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ nvkm-y += nvkm/subdev/mmu/g84.o 
nvkm-y += nvkm/subdev/mmu/gf100.o

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

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

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

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

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

 * Copyright 2017 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 "priv.h"



static const struct nvkm_mmu_func

gm200_mmu = {

	.limit = (1ULL << 40),

	.dma_bits = 40,

	.pgt_bits  = 27 - 12,

	.spg_shift = 12,

	.lpg_shift = 17,

	.create = gf100_vm_create,

	.map_pgt = gf100_vm_map_pgt,

	.map = gf100_vm_map,

	.map_sg = gf100_vm_map_sg,

	.unmap = gf100_vm_unmap,

	.flush = gf100_vm_flush,

};



int

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

{

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

}