From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Tue, 1 May 2012 21:24:45 +0000 (+0200)
Subject: nouveau: fix channel closing
X-Git-Tag: freedesktop-libdrm-2.4.41~119
X-Git-Url: https://git.ti.com/gitweb?p=glsdk%2Flibdrm.git;a=commitdiff_plain;h=5288729823ee1c243023758c35fbe8e3a70ccf9c;hp=754655c795fff1c6267d358e54ad5198aee0cdd6

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 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;