xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/nouveau: allocate mmu object for every client

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs
2017-11-01 03:56:19 +10:00
parent 359088d5b8
commit 01670a79d5
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/nouveau/nouveau_drm.c
View File

@@ -116,6 +116,7 @@ nouveau_cli_fini(struct nouveau_cli *cli)
{ {
usif_client_fini(cli); usif_client_fini(cli);
nouveau_vmm_fini(&cli->vmm); nouveau_vmm_fini(&cli->vmm);
nvif_mmu_fini(&cli->mmu);
nvif_device_fini(&cli->device); nvif_device_fini(&cli->device);
mutex_lock(&cli->drm->master.lock); mutex_lock(&cli->drm->master.lock);
nvif_client_fini(&cli->base); nvif_client_fini(&cli->base);
@@ -126,6 +127,13 @@ static int
nouveau_cli_init(struct nouveau_drm *drm, const char *sname, nouveau_cli_init(struct nouveau_drm *drm, const char *sname,
struct nouveau_cli *cli) struct nouveau_cli *cli)
{ {
static const struct nvif_mclass
mmus[] = {
{ NVIF_CLASS_MMU_GF100, -1 },
{ NVIF_CLASS_MMU_NV50 , -1 },
{ NVIF_CLASS_MMU_NV04 , -1 },
{}
};
u64 device = nouveau_name(drm->dev); u64 device = nouveau_name(drm->dev);
int ret; int ret;
@@ -160,6 +168,18 @@ nouveau_cli_init(struct nouveau_drm *drm, const char *sname,
goto done; goto done;
} }
ret = nvif_mclass(&cli->device.object, mmus);
if (ret < 0) {
NV_ERROR(drm, "No supported MMU class\n");
goto done;
}
ret = nvif_mmu_init(&cli->device.object, mmus[ret].oclass, &cli->mmu);
if (ret) {
NV_ERROR(drm, "MMU allocation failed: %d\n", ret);
goto done;
}
done: done:
if (ret) if (ret)
nouveau_cli_fini(cli); nouveau_cli_fini(cli);

2
drivers/gpu/drm/nouveau/nouveau_drv.h
View File

@@ -42,6 +42,7 @@
#include <nvif/client.h> #include <nvif/client.h>
#include <nvif/device.h> #include <nvif/device.h>
#include <nvif/ioctl.h> #include <nvif/ioctl.h>
#include <nvif/mmu.h>
#include <drm/drmP.h> #include <drm/drmP.h>
@@ -91,6 +92,7 @@ struct nouveau_cli {
struct mutex mutex; struct mutex mutex;
struct nvif_device device; struct nvif_device device;
struct nvif_mmu mmu;
struct nouveau_vmm vmm; struct nouveau_vmm vmm;
struct nvkm_vm *vm; struct nvkm_vm *vm;