summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2014-07-21 11:59:44 +0200
committerBen Skeggs <bskeggs@redhat.com>2014-08-10 05:11:11 +1000
commitcbb4cf8bdffd943fa7cff724232b57b0e6891095 (patch)
tree1bc927a5f2871535a447820a60716a44dc12b108 /drivers/gpu/drm/nouveau
parentfd1496a0fc77f955317d6ca511f66a9e788e7e02 (diff)
downloadop-kernel-dev-cbb4cf8bdffd943fa7cff724232b57b0e6891095.zip
op-kernel-dev-cbb4cf8bdffd943fa7cff724232b57b0e6891095.tar.gz
drm/nouveau/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@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/perfmon/base.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/perfmon/base.c b/drivers/gpu/drm/nouveau/core/engine/perfmon/base.c
index e9c5e51..7481003 100644
--- a/drivers/gpu/drm/nouveau/core/engine/perfmon/base.c
+++ b/drivers/gpu/drm/nouveau/core/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);
}
OpenPOWER on IntegriCloud