diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2017-11-01 03:56:19 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-11-02 13:32:16 +1000 |
| commit | 8e0042d505e86299544cf000e26408bdd252e36b (patch) | |
| tree | 9311dcfbcaaa99c40f172a204046120d090a5c1d /drivers/gpu/drm/nouveau/nvkm/core | |
| parent | 01326050391ceee2cf1b6c91c108414a35f40861 (diff) | |
drm/nouveau/core/object: plumb the unmap ioctl through
MMU will be using this for BAR mappings.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/core')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/core/ioctl.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/core/object.c | 9 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/core/oproxy.c | 7 |
3 files changed, 17 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c b/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c index bf2507f17baa..a28018ee5b19 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c @@ -287,6 +287,7 @@ nvkm_ioctl_unmap(struct nvkm_client *client, nvif_ioctl(object, "unmap size %d\n", size); if (!(ret = nvif_unvers(ret, &data, &size, args->none))) { nvif_ioctl(object, "unmap\n"); + ret = nvkm_object_unmap(object); } return ret; diff --git a/drivers/gpu/drm/nouveau/nvkm/core/object.c b/drivers/gpu/drm/nouveau/nvkm/core/object.c index 516e73a52665..301a5e5b5f7f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/object.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/object.c @@ -111,6 +111,14 @@ nvkm_object_map(struct nvkm_object *object, void *argv, u32 argc, } int +nvkm_object_unmap(struct nvkm_object *object) +{ + if (likely(object->func->unmap)) + return object->func->unmap(object); + return -ENODEV; +} + +int nvkm_object_rd08(struct nvkm_object *object, u64 addr, u8 *data) { if (likely(object->func->rd08)) @@ -260,6 +268,7 @@ nvkm_object_dtor(struct nvkm_object *object) } nvif_debug(object, "destroy running...\n"); + nvkm_object_unmap(object); if (object->func->dtor) data = object->func->dtor(object); nvkm_engine_unref(&object->engine); diff --git a/drivers/gpu/drm/nouveau/nvkm/core/oproxy.c b/drivers/gpu/drm/nouveau/nvkm/core/oproxy.c index e7dd15b97721..16299837a296 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/oproxy.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/oproxy.c @@ -45,6 +45,12 @@ nvkm_oproxy_map(struct nvkm_object *object, void *argv, u32 argc, } static int +nvkm_oproxy_unmap(struct nvkm_object *object) +{ + return nvkm_object_unmap(nvkm_oproxy(object)->object); +} + +static int nvkm_oproxy_rd08(struct nvkm_object *object, u64 addr, u8 *data) { return nvkm_object_rd08(nvkm_oproxy(object)->object, addr, data); @@ -173,6 +179,7 @@ nvkm_oproxy_func = { .mthd = nvkm_oproxy_mthd, .ntfy = nvkm_oproxy_ntfy, .map = nvkm_oproxy_map, + .unmap = nvkm_oproxy_unmap, .rd08 = nvkm_oproxy_rd08, .rd16 = nvkm_oproxy_rd16, .rd32 = nvkm_oproxy_rd32, |