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

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

drm/nouveau/mmu/nv50,g84: type-based vram allocation and bar mapping 



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

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_MEM                               /* if000a.h */  0x8000000a

#define NVIF_CLASS_MEM_NV04                          /* if000b.h */  0x8000000b

#define NVIF_CLASS_MEM_NV50                          /* if500b.h */  0x8000500b



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

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

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

0 → 100644
+25 −0
Original line number Diff line number Diff line 
#ifndef __NVIF_IF500B_H__

#define __NVIF_IF500B_H__

#include "if000a.h"



struct nv50_mem_vn {

	/* nvif_mem_vX ... */

};



struct nv50_mem_v0 {

	/* nvif_mem_vX ... */

	__u8  version;

	__u8  bankswz;

	__u8  contig;

};



struct nv50_mem_map_vn {

};



struct nv50_mem_map_v0 {

	__u8  version;

	__u8  ro;

	__u8  kind;

	__u8  comp;

};

#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ nvkm-y += nvkm/subdev/mmu/gp10b.o 


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

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

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



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

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

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

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 * 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>
@@ -28,6 +29,7 @@ g84_mmu = { 
	.limit = (1ULL << 40),

	.dma_bits = 40,

	.lpg_shift = 16,

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

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

	.kind = nv50_mmu_kind,

	.kind_sys = true,

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

+5 −0
Original line number Diff line number Diff line
@@ -10,4 +10,9 @@ int nv04_mem_new(struct nvkm_mmu *, int, u8, u64, void *, u32, 
		 struct nvkm_memory **);

int nv04_mem_map(struct nvkm_mmu *, struct nvkm_memory *, void *, u32,

		 u64 *, u64 *, struct nvkm_vma **);



int nv50_mem_new(struct nvkm_mmu *, int, u8, u64, void *, u32,

		 struct nvkm_memory **);

int nv50_mem_map(struct nvkm_mmu *, struct nvkm_memory *, void *, u32,

		 u64 *, u64 *, struct nvkm_vma **);

#endif