Nouveau - Jan 2010 - [libdrm PATCH] nouveau: disable flush_notify on channel_free

From: Marcin Slusarz <marcin.slusarz at gmail.com>
Subject: [libdrm PATCH] nouveau: disable flush_notify on channel_free

We don't want do call flush_notify when we will FIRE the RING
a couple of lines later, because grobj bound to this channel
might be already freed.
---
 nouveau/nouveau_channel.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/nouveau/nouveau_channel.c b/nouveau/nouveau_channel.c
index 14cf4c6..01d6681 100644
--- a/nouveau/nouveau_channel.c
+++ b/nouveau/nouveau_channel.c
@@ -107,6 +107,7 @@ nouveau_channel_free(struct nouveau_channel **chan)
 	if (!chan || !*chan)
 		return;
 	nvchan = nouveau_channel(*chan);
+	(*chan)->flush_notify = NULL;
 	*chan = NULL;
 	nvdev = nouveau_device(nvchan->base.device);
 
-- 
1.6.6.rc3

I'll push this one tomorrow if there are no complaints.

On Tue, Jan 12, 2010 at 3:38 PM, Marcin Slusarz
<marcin.slusarz at gmail.com> wrote:
> From: Marcin Slusarz <marcin.slusarz at gmail.com>
> Subject: [libdrm PATCH] nouveau: disable flush_notify on channel_free
>
> We don't want do call flush_notify when we will FIRE the RING
> a couple of lines later, because grobj bound to this channel
> might be already freed.
> ---
> ?nouveau/nouveau_channel.c | ? ?1 +
> ?1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/nouveau/nouveau_channel.c b/nouveau/nouveau_channel.c
> index 14cf4c6..01d6681 100644
> --- a/nouveau/nouveau_channel.c
> +++ b/nouveau/nouveau_channel.c
> @@ -107,6 +107,7 @@ nouveau_channel_free(struct nouveau_channel **chan)
> ? ? ? ?if (!chan || !*chan)
> ? ? ? ? ? ? ? ?return;
> ? ? ? ?nvchan = nouveau_channel(*chan);
> + ? ? ? (*chan)->flush_notify = NULL;
> ? ? ? ?*chan = NULL;
> ? ? ? ?nvdev = nouveau_device(nvchan->base.device);
>
> --
> 1.6.6.rc3
>
> _______________________________________________
> Nouveau mailing list
> Nouveau at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/nouveau
>