From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Skeggs Subject: Re: [PATCH] nouveau: fix channel closing Date: Wed, 02 May 2012 21:21:45 +1000 Message-ID: <1335957705.1898.0.camel@nisroch> References: <20120501212445.GA6212@joi.lan> Reply-To: skeggsb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20120501212445.GA6212-OI9uyE9O0yo@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nouveau-bounces+gcfxn-nouveau=m.gmane.org-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Errors-To: nouveau-bounces+gcfxn-nouveau=m.gmane.org-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org To: Marcin Slusarz Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org On Tue, 2012-05-01 at 23:24 +0200, Marcin Slusarz wrote: > Restore code lost in libdrm_nouveau rewrite. Thanks, pushed. > --- > nouveau/nouveau.c | 17 ++++++++++++----- > 1 files changed, 12 insertions(+), 5 deletions(-) > > diff --git a/nouveau/nouveau.c b/nouveau/nouveau.c > index f0bc2c3..5aa4107 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;