Attachment 136840 Details for Bug 104672 – Tentative patch

[patch] Tentative patch

file_104672.txt (text/plain), 6.69 KB, created by Pierre Moreau on 2018-01-19 01:35:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Moreau

Created: 2018-01-19 01:35:58 UTC

Size: 6.69 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
>index 0760b93e9d1f..baab93398e54 100644
>--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
>+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
>@@ -121,6 +121,7 @@ int nv41_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);
> 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 mcp77_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 **);
>diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
>index 00eeaaffeae5..08e77cd55e6e 100644
>--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
>+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
>@@ -1251,7 +1251,7 @@ nvaa_chipset = {
> 	.i2c = g94_i2c_new,
> 	.imem = nv50_instmem_new,
> 	.mc = g98_mc_new,
>-	.mmu = g84_mmu_new,
>+	.mmu = mcp77_mmu_new,
> 	.mxm = nv50_mxm_new,
> 	.pci = g94_pci_new,
> 	.therm = g84_therm_new,
>@@ -1283,7 +1283,7 @@ nvac_chipset = {
> 	.i2c = g94_i2c_new,
> 	.imem = nv50_instmem_new,
> 	.mc = g98_mc_new,
>-	.mmu = g84_mmu_new,
>+	.mmu = mcp77_mmu_new,
> 	.mxm = nv50_mxm_new,
> 	.pci = g94_pci_new,
> 	.therm = g84_therm_new,
>diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild
>index 352a65f9371c..67ee983bb026 100644
>--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild
>+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild
>@@ -4,6 +4,7 @@ nvkm-y += nvkm/subdev/mmu/nv41.o
> 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/mcp77.o
> nvkm-y += nvkm/subdev/mmu/gf100.o
> nvkm-y += nvkm/subdev/mmu/gk104.o
> nvkm-y += nvkm/subdev/mmu/gk20a.o
>@@ -22,6 +23,7 @@ nvkm-y += nvkm/subdev/mmu/vmmnv04.o
> nvkm-y += nvkm/subdev/mmu/vmmnv41.o
> nvkm-y += nvkm/subdev/mmu/vmmnv44.o
> nvkm-y += nvkm/subdev/mmu/vmmnv50.o
>+nvkm-y += nvkm/subdev/mmu/vmmmcp77.o
> nvkm-y += nvkm/subdev/mmu/vmmgf100.o
> nvkm-y += nvkm/subdev/mmu/vmmgk104.o
> nvkm-y += nvkm/subdev/mmu/vmmgk20a.o
>diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h
>index 6d8f61ea467a..da06e64d8a7d 100644
>--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h
>+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h
>@@ -95,6 +95,9 @@ struct nvkm_vmm_desc {
> 	const struct nvkm_vmm_desc_func *func;
> };
> 
>+extern const struct nvkm_vmm_desc nv50_vmm_desc_12[];
>+extern const struct nvkm_vmm_desc nv50_vmm_desc_16[];
>+
> extern const struct nvkm_vmm_desc gk104_vmm_desc_16_12[];
> extern const struct nvkm_vmm_desc gk104_vmm_desc_16_16[];
> extern const struct nvkm_vmm_desc gk104_vmm_desc_17_12[];
>@@ -169,6 +172,11 @@ int nv04_vmm_new_(const struct nvkm_vmm_func *, struct nvkm_mmu *, u32,
> 		  const char *, struct nvkm_vmm **);
> int nv04_vmm_valid(struct nvkm_vmm *, void *, u32, struct nvkm_vmm_map *);
> 
>+int nv50_vmm_join(struct nvkm_vmm *, struct nvkm_memory *);
>+void nv50_vmm_part(struct nvkm_vmm *, struct nvkm_memory *);
>+int nv50_vmm_valid(struct nvkm_vmm *, void *, u32, struct nvkm_vmm_map *);
>+void nv50_vmm_flush(struct nvkm_vmm *, int);
>+
> int gf100_vmm_new_(const struct nvkm_vmm_func *, const struct nvkm_vmm_func *,
> 		   struct nvkm_mmu *, u64, u64, void *, u32,
> 		   struct lock_class_key *, const char *, struct nvkm_vmm **);
>@@ -200,6 +208,8 @@ int nv44_vmm_new(struct nvkm_mmu *, u64, u64, void *, u32,
> 		 struct lock_class_key *, const char *, struct nvkm_vmm **);
> int nv50_vmm_new(struct nvkm_mmu *, u64, u64, void *, u32,
> 		 struct lock_class_key *, const char *, struct nvkm_vmm **);
>+int mcp77_vmm_new(struct nvkm_mmu *, u64, u64, void *, u32,
>+		  struct lock_class_key *, const char *, struct nvkm_vmm **);
> int g84_vmm_new(struct nvkm_mmu *, u64, u64, void *, u32,
> 		struct lock_class_key *, const char *, struct nvkm_vmm **);
> int gf100_vmm_new(struct nvkm_mmu *, u64, u64, void *, u32,
>diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c
>index 863a2edd9861..7a5332945ea0 100644
>--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c
>+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c
>@@ -32,7 +32,7 @@ static inline void
> nv50_vmm_pgt_pte(struct nvkm_vmm *vmm, struct nvkm_mmu_pt *pt,
> 		 u32 ptei, u32 ptes, struct nvkm_vmm_map *map, u64 addr)
> {
>-	u64 next = addr | map->type, data;
>+	u64 next = addr + map->type, data;
> 	u32 pten;
> 	int log2blk;
> 
>@@ -69,7 +69,7 @@ nv50_vmm_pgt_dma(struct nvkm_vmm *vmm, struct nvkm_mmu_pt *pt,
> 		VMM_SPAM(vmm, "DMAA %08x %08x PTE(s)", ptei, ptes);
> 		nvkm_kmap(pt->memory);
> 		while (ptes--) {
>-			const u64 data = *map->dma++ | map->type;
>+			const u64 data = *map->dma++ + map->type;
> 			VMM_WO064(pt, vmm, ptei++ * 8, data);
> 			map->type += map->ctag;
> 		}
>@@ -163,21 +163,21 @@ nv50_vmm_pgd = {
> 	.pde = nv50_vmm_pgd_pde,
> };
> 
>-static const struct nvkm_vmm_desc
>+const struct nvkm_vmm_desc
> nv50_vmm_desc_12[] = {
> 	{ PGT, 17, 8, 0x1000, &nv50_vmm_pgt },
> 	{ PGD, 11, 0, 0x0000, &nv50_vmm_pgd },
> 	{}
> };
> 
>-static const struct nvkm_vmm_desc
>+const struct nvkm_vmm_desc
> nv50_vmm_desc_16[] = {
> 	{ PGT, 13, 8, 0x1000, &nv50_vmm_pgt },
> 	{ PGD, 11, 0, 0x0000, &nv50_vmm_pgd },
> 	{}
> };
> 
>-static void
>+void
> nv50_vmm_flush(struct nvkm_vmm *vmm, int level)
> {
> 	struct nvkm_subdev *subdev = &vmm->mmu->subdev;
>@@ -223,7 +223,7 @@ nv50_vmm_flush(struct nvkm_vmm *vmm, int level)
> 	mutex_unlock(&subdev->mutex);
> }
> 
>-static int
>+int
> nv50_vmm_valid(struct nvkm_vmm *vmm, void *argv, u32 argc,
> 	       struct nvkm_vmm_map *map)
> {
>@@ -292,7 +292,7 @@ nv50_vmm_valid(struct nvkm_vmm *vmm, void *argv, u32 argc,
> 
> 	if (comp) {
> 		u32 tags = (nvkm_memory_size(memory) >> 16) * comp;
>-		if (aper != 0 || !(page->type & NVKM_VMM_PAGE_COMP)) {
>+		if (!(page->type & NVKM_VMM_PAGE_COMP)) {
> 			VMM_DEBUG(vmm, "comp %d %02x", aper, page->type);
> 			return -EINVAL;
> 		}
>@@ -321,7 +321,7 @@ nv50_vmm_valid(struct nvkm_vmm *vmm, void *argv, u32 argc,
> 	return 0;
> }
> 
>-static void
>+void
> nv50_vmm_part(struct nvkm_vmm *vmm, struct nvkm_memory *inst)
> {
> 	struct nvkm_vmm_join *join;
>@@ -335,7 +335,7 @@ nv50_vmm_part(struct nvkm_vmm *vmm, struct nvkm_memory *inst)
> 	}
> }
> 
>-static int
>+int
> nv50_vmm_join(struct nvkm_vmm *vmm, struct nvkm_memory *inst)
> {
> 	const u32 pd_offset = vmm->mmu->func->vmm.pd_offset;

Actions: View | Splinter Review

Attachments on bug 104672: 136805 | 136815 | 136840

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.