diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 04:10:23 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 04:43:30 +1000 |
commit | b444ec0997bfdda01be65f26e831c1724a6dd9f4 (patch) | |
tree | 71cdced534b92e8e36d49d43b20acd5bbc37954c | |
parent | 82dbf82b10b255c2283791c3b5b1a817416b8439 (diff) | |
download | nouveau-b444ec0997bfdda01be65f26e831c1724a6dd9f4.tar.gz |
drm: use ioctl interface for abi16 gpuobj free
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drm/nouveau_abi16.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/drm/nouveau_abi16.c b/drm/nouveau_abi16.c index 9ddc624d2..3192bbaf3 100644 --- a/drm/nouveau_abi16.c +++ b/drm/nouveau_abi16.c @@ -490,9 +490,22 @@ int nouveau_abi16_ioctl_gpuobj_free(ABI16_IOCTL_ARGS) { struct drm_nouveau_gpuobj_free *fini = data; + struct { + struct nvif_ioctl_v0 ioctl; + struct nvif_ioctl_del del; + } args = { + .ioctl.owner = NVDRM_OBJECT_ABI16, + .ioctl.type = NVIF_IOCTL_V0_DEL, + .ioctl.path_nr = 4, + .ioctl.path[3] = NOUVEAU_ABI16_CLIENT, + .ioctl.path[2] = NOUVEAU_ABI16_DEVICE, + .ioctl.path[1] = NOUVEAU_ABI16_CHAN(fini->channel), + .ioctl.path[0] = fini->handle, + }; struct nouveau_abi16 *abi16 = nouveau_abi16_get(file_priv, dev); struct nouveau_abi16_chan *chan; struct nouveau_abi16_ntfy *ntfy; + struct nvif_client *client; int ret; if (unlikely(!abi16)) @@ -501,13 +514,12 @@ nouveau_abi16_ioctl_gpuobj_free(ABI16_IOCTL_ARGS) chan = nouveau_abi16_chan(abi16, fini->channel); if (!chan) return nouveau_abi16_put(abi16, -ENOENT); + client = nvif_client(nvif_object(&abi16->device)); /* synchronize with the user channel and destroy the gpu object */ nouveau_channel_idle(chan->chan); - /*XXX*/ - ret = nouveau_object_del(nv_object(nvkm_client(&abi16->device.base)), - chan->chan->object->handle, fini->handle); + ret = nvif_client_ioctl(client, &args, sizeof(args)); if (ret) return nouveau_abi16_put(abi16, ret); |