Commit 9f6219fd authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/mmu/nv50,g84: implement vmm on top of new base 



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

drivers/gpu/drm/nouveau/include/nvif/class.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#define NVIF_CLASS_VMM                               /* if000c.h */  0x8000000c

#define NVIF_CLASS_VMM_NV04                          /* if000d.h */  0x8000000d

#define NVIF_CLASS_VMM_NV50                          /* if500d.h */  0x8000500d



/* the below match nvidia-assigned (either in hw, or sw) class numbers */

#define NV_NULL_CLASS                                                0x00000030

drivers/gpu/drm/nouveau/include/nvif/if500d.h

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#ifndef __NVIF_IF500D_H__

#define __NVIF_IF500D_H__

#include "if000c.h"



struct nv50_vmm_vn {

	/* nvif_vmm_vX ... */

};

#endif

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

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ struct nvkm_vm { 
	u64 limit;



	struct nvkm_vmm_pt *pd;

	u16 pd_offset;

	struct list_head join;



	struct nvkm_mm mm;

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

+1 −0
Original line number Diff line number Diff line
@@ -16,3 +16,4 @@ nvkm-y += nvkm/subdev/mmu/vmm.o 
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

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

+0 −1
Original line number Diff line number Diff line
@@ -727,7 +727,6 @@ nvkm_vm_del(struct kref *kref) 


	nvkm_mm_fini(&vm->mm);

	vfree(vm->pgt);



	if (vm->func)

		nvkm_vmm_dtor(vm);

	kfree(vm);