From 0844828b198f28b8bb48b15df121220c3a175e07 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 30 Oct 2012 10:59:12 +1000 Subject: [PATCH] --- yaml --- r: 345409 b: refs/heads/master c: d6bf2f370703c0cab60bf1f5bf871a3f00eb8872 h: refs/heads/master i: 345407: 08977de7741161b8154cb4c6423b57d9ab6eebee v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_display.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4fd7c3d13ecb..f4632b05d185 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94e5c39bad56a7b097d3b168b90a72cc1633c8f1 +refs/heads/master: d6bf2f370703c0cab60bf1f5bf871a3f00eb8872 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_display.c b/trunk/drivers/gpu/drm/nouveau/nouveau_display.c index 86124b131f4f..b875fcff973a 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_display.c @@ -400,11 +400,12 @@ nouveau_display_destroy(struct drm_device *dev) nouveau_backlight_exit(dev); drm_vblank_cleanup(dev); + drm_kms_helper_poll_fini(dev); + drm_mode_config_cleanup(dev); + if (disp->dtor) disp->dtor(dev); - drm_kms_helper_poll_fini(dev); - drm_mode_config_cleanup(dev); nouveau_drm(dev)->display = NULL; kfree(disp); }