nouveau: fix channel closing

Restore code lost in libdrm_nouveau rewrite.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/nouveau/nouveau.c b/nouveau/nouveau.c
index f0bc2c3f25f79fc31575c8b1c9043f499306062b..5aa41070d582f7f67057f41379b6d7ab7445fd0d 100644 (file)
--- 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;