UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2017-11-01 03:56:19 +10:00
parent 957e18a70d
commit 0766116157
7 changed files with 124 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/include/nvif/class.h
View File

@ -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

25
drivers/gpu/drm/nouveau/include/nvif/if500b.h Normal file
View File

@ -0,0 +1,25 @@
#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

1
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild
View File

@ -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

2
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/g84.c
View File

@ -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,

5
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mem.h
View File

@ -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

88
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/memnv50.c Normal file
View File

@ -0,0 +1,88 @@
/*
* 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/bar.h>
#include <subdev/fb.h>
#include <nvif/class.h>
#include <nvif/if500b.h>
#include <nvif/if500d.h>
#include <nvif/unpack.h>
int
nv50_mem_map(struct nvkm_mmu *mmu, struct nvkm_memory *memory, void *argv,
u32 argc, u64 *paddr, u64 *psize, struct nvkm_vma **pvma)
{
struct nv50_vmm_map_v0 uvmm = {};
union {
struct nv50_mem_map_vn vn;
struct nv50_mem_map_v0 v0;
} *args = argv;
struct nvkm_device *device = mmu->subdev.device;
struct nvkm_vmm *bar = nvkm_bar_bar1_vmm(device);
u64 size = nvkm_memory_size(memory);
int ret = -ENOSYS;
if (!(ret = nvif_unpack(ret, &argv, &argc, args->v0, 0, 0, false))) {
uvmm.ro = args->v0.ro;
uvmm.kind = args->v0.kind;
uvmm.comp = args->v0.comp;
} else
if (!(ret = nvif_unvers(ret, &argv, &argc, args->vn))) {
} else
return ret;
ret = nvkm_vmm_get(bar, 12, size, pvma);
if (ret)
return ret;
*paddr = device->func->resource_addr(device, 1) + (*pvma)->addr;
*psize = (*pvma)->size;
return nvkm_memory_map(memory, 0, bar, *pvma, &uvmm, sizeof(uvmm));
}
int
nv50_mem_new(struct nvkm_mmu *mmu, int type, u8 page, u64 size,
void *argv, u32 argc, struct nvkm_memory **pmemory)
{
union {
struct nv50_mem_vn vn;
struct nv50_mem_v0 v0;
} *args = argv;
int ret = -ENOSYS;
bool contig;
if (!(ret = nvif_unpack(ret, &argv, &argc, args->v0, 0, 0, false))) {
type = args->v0.bankswz ? 0x02 : 0x01;
contig = args->v0.contig;
} else
if (!(ret = nvif_unvers(ret, &argv, &argc, args->vn))) {
type = 0x01;
contig = false;
} else
return -ENOSYS;
return nvkm_ram_get(mmu->subdev.device, NVKM_RAM_MM_NORMAL, type,
page, size, contig, false, pmemory);
}

2
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv50.c
View File

@ -21,6 +21,7 @@
*
* Authors: Ben Skeggs
*/
#include "mem.h"
#include "vmm.h"
#include <nvif/class.h>
@ -64,6 +65,7 @@ nv50_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, 0x1400 },
.kind = nv50_mmu_kind,
};