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

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

drm/nouveau/mmu/gk104: fork from gf100 



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

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

+1 −0
Original line number Diff line number Diff line
@@ -69,4 +69,5 @@ int nv44_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **); 
int nv50_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

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 **);

#endif

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

+9 −9
Original line number Diff line number Diff line
@@ -1678,7 +1678,7 @@ nve4_chipset = { 
	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gk104_mc_new,

	.mmu = gf100_mmu_new,

	.mmu = gk104_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,

	.pmu = gk104_pmu_new,
@@ -1717,7 +1717,7 @@ nve6_chipset = { 
	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gk104_mc_new,

	.mmu = gf100_mmu_new,

	.mmu = gk104_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,

	.pmu = gk104_pmu_new,
@@ -1756,7 +1756,7 @@ nve7_chipset = { 
	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gk104_mc_new,

	.mmu = gf100_mmu_new,

	.mmu = gk104_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,

	.pmu = gk104_pmu_new,
@@ -1820,7 +1820,7 @@ nvf0_chipset = { 
	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gk104_mc_new,

	.mmu = gf100_mmu_new,

	.mmu = gk104_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,

	.pmu = gk110_pmu_new,
@@ -1858,7 +1858,7 @@ nvf1_chipset = { 
	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gk104_mc_new,

	.mmu = gf100_mmu_new,

	.mmu = gk104_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,

	.pmu = gk110_pmu_new,
@@ -1896,7 +1896,7 @@ nv106_chipset = { 
	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gk20a_mc_new,

	.mmu = gf100_mmu_new,

	.mmu = gk104_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,

	.pmu = gk208_pmu_new,
@@ -1934,7 +1934,7 @@ nv108_chipset = { 
	.imem = nv50_instmem_new,

	.ltc = gk104_ltc_new,

	.mc = gk20a_mc_new,

	.mmu = gf100_mmu_new,

	.mmu = gk104_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,

	.pmu = gk208_pmu_new,
@@ -1972,7 +1972,7 @@ nv117_chipset = { 
	.imem = nv50_instmem_new,

	.ltc = gm107_ltc_new,

	.mc = gk20a_mc_new,

	.mmu = gf100_mmu_new,

	.mmu = gk104_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = gk104_pci_new,

	.pmu = gm107_pmu_new,
@@ -2006,7 +2006,7 @@ nv118_chipset = { 
	.imem = nv50_instmem_new,

	.ltc = gm107_ltc_new,

	.mc = gk20a_mc_new,

	.mmu = gf100_mmu_new,

	.mmu = gk104_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
@@ -5,3 +5,4 @@ nvkm-y += nvkm/subdev/mmu/nv44.o 
nvkm-y += nvkm/subdev/mmu/nv50.o

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

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

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

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

+6 −6
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ const u8 gf100_pte_storage_type_map[256] = 
};





static void

void

gf100_vm_map_pgt(struct nvkm_gpuobj *pgd, u32 index, struct nvkm_memory *pgt[2])

{

	u32 pde[2] = { 0, 0 };
@@ -98,7 +98,7 @@ gf100_vm_addr(struct nvkm_vma *vma, u64 phys, u32 memtype, u32 target) 
	return phys;

}



static void

void

gf100_vm_map(struct nvkm_vma *vma, struct nvkm_memory *pgt,

	     struct nvkm_mem *mem, u32 pte, u32 cnt, u64 phys, u64 delta)

{
@@ -123,7 +123,7 @@ gf100_vm_map(struct nvkm_vma *vma, struct nvkm_memory *pgt, 
	nvkm_done(pgt);

}



static void

void

gf100_vm_map_sg(struct nvkm_vma *vma, struct nvkm_memory *pgt,

		struct nvkm_mem *mem, u32 pte, u32 cnt, dma_addr_t *list)

{
@@ -142,7 +142,7 @@ gf100_vm_map_sg(struct nvkm_vma *vma, struct nvkm_memory *pgt, 
	nvkm_done(pgt);

}



static void

void

gf100_vm_unmap(struct nvkm_vma *vma, struct nvkm_memory *pgt, u32 pte, u32 cnt)

{

	nvkm_kmap(pgt);
@@ -155,7 +155,7 @@ gf100_vm_unmap(struct nvkm_vma *vma, struct nvkm_memory *pgt, u32 pte, u32 cnt) 
	nvkm_done(pgt);

}



static void

void

gf100_vm_flush(struct nvkm_vm *vm)

{

	struct nvkm_mmu *mmu = vm->mmu;
@@ -189,7 +189,7 @@ gf100_vm_flush(struct nvkm_vm *vm) 
	mutex_unlock(&mmu->subdev.mutex);

}



static int

int

gf100_vm_create(struct nvkm_mmu *mmu, u64 offset, u64 length, u64 mm_offset,

		struct lock_class_key *key, struct nvkm_vm **pvm)

{

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gk104.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

gk104_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

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

{

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

}