* [PATCH] nouveau: fix channel closing
@ 2012-05-01 21:24 Marcin Slusarz
[not found] ` <20120501212445.GA6212-OI9uyE9O0yo@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Marcin Slusarz @ 2012-05-01 21:24 UTC (permalink / raw)
To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Restore code lost in libdrm_nouveau rewrite.
---
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;
--
1.7.8.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] nouveau: fix channel closing
[not found] ` <20120501212445.GA6212-OI9uyE9O0yo@public.gmane.org>
@ 2012-05-02 11:21 ` Ben Skeggs
0 siblings, 0 replies; 2+ messages in thread
From: Ben Skeggs @ 2012-05-02 11:21 UTC (permalink / raw)
To: Marcin Slusarz; +Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
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;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-02 11:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-01 21:24 [PATCH] nouveau: fix channel closing Marcin Slusarz
[not found] ` <20120501212445.GA6212-OI9uyE9O0yo@public.gmane.org>
2012-05-02 11:21 ` Ben Skeggs
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.