From 5288729823ee1c243023758c35fbe8e3a70ccf9c Mon Sep 17 00:00:00 2001 From: Marcin Slusarz Date: Tue, 1 May 2012 23:24:45 +0200 Subject: nouveau: fix channel closing Restore code lost in libdrm_nouveau rewrite. Signed-off-by: Ben Skeggs --- nouveau/nouveau.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/nouveau/nouveau.c b/nouveau/nouveau.c index f0bc2c3f..5aa41070 100644 --- a/nouveau/nouveau.c +++ b/nouveau/nouveau.c @@ -278,15 +278,22 @@ nouveau_object_new(struct nouveau_object *parent, uint64_t handle, void nouveau_object_del(struct nouveau_object **pobj) { - struct drm_nouveau_gpuobj_free req; struct nouveau_object *obj = *pobj; struct nouveau_device *dev; if (obj) { dev = nouveau_object_find(obj, NOUVEAU_DEVICE_CLASS); - req.channel = obj->parent->handle; - req.handle = obj->handle; - drmCommandWrite(dev->fd, DRM_NOUVEAU_GPUOBJ_FREE, - &req, sizeof(req)); + if (obj->oclass == NOUVEAU_FIFO_CHANNEL_CLASS) { + struct drm_nouveau_channel_free req; + req.channel = obj->handle; + drmCommandWrite(dev->fd, DRM_NOUVEAU_CHANNEL_FREE, + &req, sizeof(req)); + } else { + struct drm_nouveau_gpuobj_free req; + req.channel = obj->parent->handle; + req.handle = obj->handle; + drmCommandWrite(dev->fd, DRM_NOUVEAU_GPUOBJ_FREE, + &req, sizeof(req)); + } } free(obj); *pobj = NULL; -- cgit v1.2.3