diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_state.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_state.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index c667a1138c33..e632339c323e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c | |||
@@ -516,8 +516,10 @@ nouveau_card_init(struct drm_device *dev) | |||
516 | 516 | ||
517 | dev_priv->init_state = NOUVEAU_CARD_INIT_DONE; | 517 | dev_priv->init_state = NOUVEAU_CARD_INIT_DONE; |
518 | 518 | ||
519 | if (drm_core_check_feature(dev, DRIVER_MODESET)) | 519 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { |
520 | nouveau_fbcon_init(dev); | 520 | nouveau_fbcon_init(dev); |
521 | drm_kms_helper_poll_init(dev); | ||
522 | } | ||
521 | 523 | ||
522 | return 0; | 524 | return 0; |
523 | 525 | ||
@@ -844,6 +846,7 @@ int nouveau_unload(struct drm_device *dev) | |||
844 | struct drm_nouveau_private *dev_priv = dev->dev_private; | 846 | struct drm_nouveau_private *dev_priv = dev->dev_private; |
845 | 847 | ||
846 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { | 848 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { |
849 | drm_kms_helper_poll_fini(dev); | ||
847 | nouveau_fbcon_fini(dev); | 850 | nouveau_fbcon_fini(dev); |
848 | if (dev_priv->card_type >= NV_50) | 851 | if (dev_priv->card_type >= NV_50) |
849 | nv50_display_destroy(dev); | 852 | nv50_display_destroy(dev); |