summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorMarcin Slusarz <marcin.slusarz@gmail.com>2012-10-11 23:53:48 +0200
committerBen Skeggs <bskeggs@redhat.com>2012-10-16 16:29:08 +1000
commit5db4c6c5dd26f7737c1fa45ea73549b8aef6e395 (patch)
treecbf631395c18c5c5e0f458a10d4b70f1ed16ab0f /drivers/gpu
parenteed6187d9f19535ac9339b684537f8535bf563b7 (diff)
downloadlinux-stable-5db4c6c5dd26f7737c1fa45ea73549b8aef6e395.tar.gz
linux-stable-5db4c6c5dd26f7737c1fa45ea73549b8aef6e395.tar.bz2
linux-stable-5db4c6c5dd26f7737c1fa45ea73549b8aef6e395.zip
drm/nv50/fb: fix double free of vram mm
nouveau_fb_destroy already calls nouveau_mm_fini on vram mm. Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
index 436e9efe7ef5..42d7539e6525 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
@@ -277,7 +277,6 @@ nv50_fb_dtor(struct nouveau_object *object)
__free_page(priv->r100c08_page);
}
- nouveau_mm_fini(&priv->base.vram);
nouveau_fb_destroy(&priv->base);
}