Browse Source

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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Ben Skeggs 8 years ago
parent
commit
fc21a4a099
1 changed files with 2 additions and 1 deletions
  1. 2 1
      drivers/gpu/drm/nouveau/nouveau_fbcon.c

+ 2 - 1
drivers/gpu/drm/nouveau/nouveau_fbcon.c

@@ -535,7 +535,8 @@ nouveau_fbcon_init(struct drm_device *dev)
 		preferred_bpp = 32;
 		preferred_bpp = 32;
 
 
 	/* disable all the possible outputs/crtcs before entering KMS mode */
 	/* 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);
 	ret = drm_fb_helper_initial_config(&fbcon->helper, preferred_bpp);
 	if (ret)
 	if (ret)