Commit 2ffa64eb authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/mmu/mcp77: fix regressions in stolen memory handling 



- Fixes addition of stolen memory base address to PTEs.
- Removes support for compression.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Tested-by: default avatarPierre Moreau <pierre.morrow@free.fr>
parent e062a01e

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

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,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 **);

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

+2 −2
Original line number Diff line number Diff line
@@ -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,

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

+2 −0
Original line number Diff line number Diff line
@@ -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

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

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

#include "vmm.h"



#include <nvif/class.h>



static const struct nvkm_mmu_func

mcp77_mmu = {

	.dma_bits = 40,

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

	.mem = {{ -1,  0, NVIF_CLASS_MEM_NV50}, nv50_mem_new, nv50_mem_map },

	.vmm = {{ -1, -1, NVIF_CLASS_VMM_NV50}, mcp77_vmm_new, false, 0x0200 },

	.kind = nv50_mmu_kind,

	.kind_sys = true,

};



int

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

{

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

}

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

+10 −0
Original line number Diff line number Diff line
@@ -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,