drm/nouveau/mmu/nv04-nv4x: type-based vram allocation and bar mapping (957e18a7) · Commits · 戴 / test

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		#define NVIF_CLASS_SW_GF100 /* if0005.h */ -0x00000007

		#define NVIF_CLASS_MEM /* if000a.h */ 0x8000000a
		#define NVIF_CLASS_MEM_NV04 /* if000b.h */ 0x8000000b

		#define NVIF_CLASS_VMM /* if000c.h */ 0x8000000c
		#define NVIF_CLASS_VMM_NV04 /* if000d.h */ 0x8000000d

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

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		#ifndef __NVIF_IF000B_H__
		#define __NVIF_IF000B_H__
		#include "if000a.h"

		struct nv04_mem_vn {
		/* nvkm_mem_vX ... */
		};

		struct nv04_mem_map_vn {
		};
		#endif

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ nvkm-y += nvkm/subdev/mmu/gp100.o
		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/vmm.o
		nvkm-y += nvkm/subdev/mmu/vmmnv04.o

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -5,4 +5,9 @@
		int nvkm_mem_new_type(struct nvkm_mmu *, int type, u8 page, u64 size,
		void argv, u32 argc, struct nvkm_memory *);
		int nvkm_mem_map_host(struct nvkm_memory , void *pmap);

		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 **);
		#endif

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

0 → 100644

+69 −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 <core/memory.h>
		#include <subdev/fb.h>

		#include <nvif/if000b.h>
		#include <nvif/unpack.h>

		int
		nv04_mem_map(struct nvkm_mmu mmu, struct nvkm_memory memory, void *argv,
		u32 argc, u64 paddr, u64 psize, struct nvkm_vma **pvma)
		{
		union {
		struct nv04_mem_map_vn vn;
		} *args = argv;
		struct nvkm_device *device = mmu->subdev.device;
		const u64 addr = nvkm_memory_addr(memory);
		int ret = -ENOSYS;

		if ((ret = nvif_unvers(ret, &argv, &argc, args->vn)))
		return ret;

		*paddr = device->func->resource_addr(device, 1) + addr;
		*psize = nvkm_memory_size(memory);
		*pvma = ERR_PTR(-ENODEV);
		return 0;
		}

		int
		nv04_mem_new(struct nvkm_mmu *mmu, int type, u8 page, u64 size,
		void argv, u32 argc, struct nvkm_memory *pmemory)
		{
		union {
		struct nv04_mem_vn vn;
		} *args = argv;
		int ret = -ENOSYS;

		if ((ret = nvif_unvers(ret, &argv, &argc, args->vn)))
		return ret;

		if (mmu->type[type].type & NVKM_MEM_MAPPABLE)
		type = NVKM_RAM_MM_NORMAL;
		else
		type = NVKM_RAM_MM_NOMAP;

		return nvkm_ram_get(mmu->subdev.device, type, 0x01, page,
		size, true, false, pmemory);
		}

Admin message