diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2016-11-04 17:20:36 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-11-07 14:04:49 +1000 |
| commit | fc21a4a0993a9d8d72facccad3ab6f19d8d706fb (patch) | |
| tree | 61f221e8a5b6d5dad8c990728568b8af83f2c4d2 /drivers/gpu/drm/nouveau/nouveau_fbcon.c | |
| parent | drm/nouveau/kms: prepare to support suspend/resume of display state with atomic (diff) | |
| download | linux-dev-fc21a4a0993a9d8d72facccad3ab6f19d8d706fb.tar.xz linux-dev-fc21a4a0993a9d8d72facccad3ab6f19d8d706fb.zip | |
drm/nouveau/kms: never call drm_helper_disable_unused_functions() with atomic
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fbcon.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.c | 3 |
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) |