drm/nouveau: run mode_config destructor before destroying internal display state

Later changes will depend on being able to pull down CRTCs etc with the
master display state still intact.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 86124b131f4f31a2ca18e8c2416084ad6df1f585..b875fcff973a0beac7150d75088e268c9f1f53de 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/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);
 }