Skip to content

Commit

Permalink
drm/nouveau: run mode_config destructor before destroying internal di…
Browse files Browse the repository at this point in the history
…splay 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>
  • Loading branch information
Ben Skeggs committed Nov 28, 2012
1 parent 94e5c39 commit d6bf2f3
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/gpu/drm/nouveau/nouveau_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit d6bf2f3

Please sign in to comment.