Nouveau - Jul 2014 - [PATCH] perfmon: do not forget to destroy the engine context

This fixes a crash when we reload Nouveau DRM.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 nvkm/engine/perfmon/base.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nvkm/engine/perfmon/base.c b/nvkm/engine/perfmon/base.c
index e9c5e51..7481003 100644
--- a/nvkm/engine/perfmon/base.c
+++ b/nvkm/engine/perfmon/base.c
@@ -303,6 +303,7 @@ nouveau_perfctx_dtor(struct nouveau_object *object)
 {
 	struct nouveau_perfmon *ppm = (void *)object->engine;
 	mutex_lock(&nv_subdev(ppm)->mutex);
+	nouveau_engctx_destroy(&ppm->context->base);
 	ppm->context = NULL;
 	mutex_unlock(&nv_subdev(ppm)->mutex);
 }
-- 
2.0.0

On Mon, Jul 21, 2014 at 7:59 PM, Samuel Pitoiset
<samuel.pitoiset at gmail.com> wrote:
> This fixes a crash when we reload Nouveau DRM.
Thanks Samuel :)
>
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
>  nvkm/engine/perfmon/base.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/nvkm/engine/perfmon/base.c b/nvkm/engine/perfmon/base.c
> index e9c5e51..7481003 100644
> --- a/nvkm/engine/perfmon/base.c
> +++ b/nvkm/engine/perfmon/base.c
> @@ -303,6 +303,7 @@ nouveau_perfctx_dtor(struct nouveau_object *object)
>  {
>         struct nouveau_perfmon *ppm = (void *)object->engine;
>         mutex_lock(&nv_subdev(ppm)->mutex);
> +       nouveau_engctx_destroy(&ppm->context->base);
>         ppm->context = NULL;
>         mutex_unlock(&nv_subdev(ppm)->mutex);
>  }
> --
> 2.0.0
>
> _______________________________________________
> Nouveau mailing list
> Nouveau at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/nouveau