summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Slusarz <marcin.slusarz@gmail.com>2012-05-01 23:24:45 +0200
committerBen Skeggs <bskeggs@redhat.com>2012-05-02 21:21:09 +1000
commit5288729823ee1c243023758c35fbe8e3a70ccf9c (patch)
treedea09cdf405f5a36fbf3609cf0217184d84325ad
parent754655c795fff1c6267d358e54ad5198aee0cdd6 (diff)
nouveau: fix channel closing
Restore code lost in libdrm_nouveau rewrite. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--nouveau/nouveau.c17
1 files 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;