drm/nouveau/kms: never call drm_helper_disable_unused_functions() with atomic

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

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 4192b7926769..cc8c58337981 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -535,7 +535,8 @@ nouveau_fbcon_init(struct drm_device *dev)
                 preferred_bpp = 32;
 
         /* disable all the possible outputs/crtcs before entering KMS mode */
-        drm_helper_disable_unused_functions(dev);
+        if (!dev->mode_config.funcs->atomic_commit)
+                drm_helper_disable_unused_functions(dev);
 
         ret = drm_fb_helper_initial_config(&fbcon->helper, preferred_bpp);
         if (ret)