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

Commit 19a82e49 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/core/memory: change map interface to support upcoming mmu changes 



Map flags (access, kind, etc) are currently defined in either the VMA,
or the memory object, which turns out to not be ideal for things like
suballocated buffers, etc.

These will become per-map flags instead, so we need to support passing
these arguments in nvkm_memory_map().

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

drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h

+2 −5
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
#define __NVKM_GPUOBJ_H__

#include <core/memory.h>

#include <core/mm.h>

struct nvkm_vma;

struct nvkm_vm;



#define NVOBJ_FLAG_ZERO_ALLOC 0x00000001

#define NVOBJ_FLAG_HEAP       0x00000004
@@ -29,15 +27,14 @@ struct nvkm_gpuobj_func { 
	void (*release)(struct nvkm_gpuobj *);

	u32 (*rd32)(struct nvkm_gpuobj *, u32 offset);

	void (*wr32)(struct nvkm_gpuobj *, u32 offset, u32 data);

	int (*map)(struct nvkm_gpuobj *, u64 offset, struct nvkm_vmm *,

		   struct nvkm_vma *, void *argv, u32 argc);

};



int nvkm_gpuobj_new(struct nvkm_device *, u32 size, int align, bool zero,

		    struct nvkm_gpuobj *parent, struct nvkm_gpuobj **);

void nvkm_gpuobj_del(struct nvkm_gpuobj **);

int nvkm_gpuobj_wrap(struct nvkm_memory *, struct nvkm_gpuobj **);

int nvkm_gpuobj_map(struct nvkm_gpuobj *, struct nvkm_vm *, u32 access,

		    struct nvkm_vma *);

void nvkm_gpuobj_unmap(struct nvkm_vma *);

void nvkm_gpuobj_memcpy_to(struct nvkm_gpuobj *dst, u32 dstoffset, void *src,

			   u32 length);

void nvkm_gpuobj_memcpy_from(void *dst, struct nvkm_gpuobj *src, u32 srcoffset,

drivers/gpu/drm/nouveau/include/nvkm/core/memory.h

+6 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include <core/os.h>

struct nvkm_device;

struct nvkm_vma;

struct nvkm_vm;

struct nvkm_vmm;



struct nvkm_tags {

	struct nvkm_mm_node *mn;
@@ -28,10 +28,11 @@ struct nvkm_memory_func { 
	enum nvkm_memory_target (*target)(struct nvkm_memory *);

	u64 (*addr)(struct nvkm_memory *);

	u64 (*size)(struct nvkm_memory *);

	void (*boot)(struct nvkm_memory *, struct nvkm_vm *);

	void (*boot)(struct nvkm_memory *, struct nvkm_vmm *);

	void __iomem *(*acquire)(struct nvkm_memory *);

	void (*release)(struct nvkm_memory *);

	void (*map)(struct nvkm_memory *, struct nvkm_vma *, u64 offset);

	int (*map)(struct nvkm_memory *, u64 offset, struct nvkm_vmm *,

		   struct nvkm_vma *, void *argv, u32 argc);

};



struct nvkm_memory_ptrs {
@@ -53,7 +54,8 @@ void nvkm_memory_tags_put(struct nvkm_memory *, struct nvkm_device *, 
#define nvkm_memory_addr(p) (p)->func->addr(p)

#define nvkm_memory_size(p) (p)->func->size(p)

#define nvkm_memory_boot(p,v) (p)->func->boot((p),(v))

#define nvkm_memory_map(p,v,o) (p)->func->map((p),(v),(o))

#define nvkm_memory_map(p,o,vm,va,av,ac)                                       \

	(p)->func->map((p),(o),(vm),(va),(av),(ac))



/* accessor macros - kmap()/done() must bracket use of the other accessor

 * macros to guarantee correct behaviour across all chipsets

drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c

+23 −20
Original line number Diff line number Diff line
@@ -42,6 +42,14 @@ nvkm_gpuobj_wr32_fast(struct nvkm_gpuobj *gpuobj, u32 offset, u32 data) 
}



/* accessor functions for gpuobjs allocated directly from instmem */

static int

nvkm_gpuobj_heap_map(struct nvkm_gpuobj *gpuobj, u64 offset,

		     struct nvkm_vmm *vmm, struct nvkm_vma *vma,

		     void *argv, u32 argc)

{

	return nvkm_memory_map(gpuobj->memory, offset, vmm, vma, argv, argc);

}



static u32

nvkm_gpuobj_heap_rd32(struct nvkm_gpuobj *gpuobj, u32 offset)

{
@@ -67,6 +75,7 @@ nvkm_gpuobj_heap_fast = { 
	.release = nvkm_gpuobj_heap_release,

	.rd32 = nvkm_gpuobj_rd32_fast,

	.wr32 = nvkm_gpuobj_wr32_fast,

	.map = nvkm_gpuobj_heap_map,

};



static const struct nvkm_gpuobj_func
@@ -74,6 +83,7 @@ nvkm_gpuobj_heap_slow = { 
	.release = nvkm_gpuobj_heap_release,

	.rd32 = nvkm_gpuobj_heap_rd32,

	.wr32 = nvkm_gpuobj_heap_wr32,

	.map = nvkm_gpuobj_heap_map,

};



static void *
@@ -90,9 +100,19 @@ nvkm_gpuobj_heap_acquire(struct nvkm_gpuobj *gpuobj) 
static const struct nvkm_gpuobj_func

nvkm_gpuobj_heap = {

	.acquire = nvkm_gpuobj_heap_acquire,

	.map = nvkm_gpuobj_heap_map,

};



/* accessor functions for gpuobjs sub-allocated from a parent gpuobj */

static int

nvkm_gpuobj_map(struct nvkm_gpuobj *gpuobj, u64 offset,

		struct nvkm_vmm *vmm, struct nvkm_vma *vma,

		void *argv, u32 argc)

{

	return nvkm_memory_map(gpuobj->parent, gpuobj->node->offset + offset,

			       vmm, vma, argv, argc);

}



static u32

nvkm_gpuobj_rd32(struct nvkm_gpuobj *gpuobj, u32 offset)

{
@@ -118,6 +138,7 @@ nvkm_gpuobj_fast = { 
	.release = nvkm_gpuobj_release,

	.rd32 = nvkm_gpuobj_rd32_fast,

	.wr32 = nvkm_gpuobj_wr32_fast,

	.map = nvkm_gpuobj_map,

};



static const struct nvkm_gpuobj_func
@@ -125,6 +146,7 @@ nvkm_gpuobj_slow = { 
	.release = nvkm_gpuobj_release,

	.rd32 = nvkm_gpuobj_rd32,

	.wr32 = nvkm_gpuobj_wr32,

	.map = nvkm_gpuobj_map,

};



static void *
@@ -143,6 +165,7 @@ nvkm_gpuobj_acquire(struct nvkm_gpuobj *gpuobj) 
static const struct nvkm_gpuobj_func

nvkm_gpuobj_func = {

	.acquire = nvkm_gpuobj_acquire,

	.map = nvkm_gpuobj_map,

};



static int
@@ -218,26 +241,6 @@ nvkm_gpuobj_new(struct nvkm_device *device, u32 size, int align, bool zero, 
	return ret;

}



int

nvkm_gpuobj_map(struct nvkm_gpuobj *gpuobj, struct nvkm_vm *vm,

		u32 access, struct nvkm_vma *vma)

{

	struct nvkm_memory *memory = gpuobj->memory;

	int ret = nvkm_vm_get(vm, gpuobj->size, 12, access, vma);

	if (ret == 0)

		nvkm_memory_map(memory, vma, 0);

	return ret;

}



void

nvkm_gpuobj_unmap(struct nvkm_vma *vma)

{

	if (vma->node) {

		nvkm_vm_unmap(vma);

		nvkm_vm_put(vma);

	}

}



/* the below is basically only here to support sharing the paged dma object

 * for PCI(E)GART on <=nv4x chipsets, and should *not* be expected to work

 * anywhere else.

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c

+1 −2
Original line number Diff line number Diff line
@@ -591,8 +591,7 @@ gf100_fifo_oneinit(struct nvkm_fifo *base) 
	if (ret)

		return ret;



	nvkm_memory_map(fifo->user.mem, &fifo->user.bar, 0);

	return 0;

	return nvkm_memory_map(fifo->user.mem, 0, bar, &fifo->user.bar, NULL, 0);

}



static void

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c

+1 −2
Original line number Diff line number Diff line
@@ -841,8 +841,7 @@ gk104_fifo_oneinit(struct nvkm_fifo *base) 
	if (ret)

		return ret;



	nvkm_memory_map(fifo->user.mem, &fifo->user.bar, 0);

	return 0;

	return nvkm_memory_map(fifo->user.mem, 0, bar, &fifo->user.bar, NULL, 0);

}



static void