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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2016-11-04 17:20:36 +10:00
parent b167db0e68
commit fc21a4a099
1 changed files with 2 additions and 1 deletions

View File

@ -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)