]> git.baikalelectronics.ru Git - kernel.git/commit
drm/nouveau/kms: restore fbcon after display has been resumed
authorBen Skeggs <bskeggs@redhat.com>
Mon, 30 Jun 2014 03:04:14 +0000 (13:04 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Tue, 8 Jul 2014 02:56:54 +0000 (12:56 +1000)
commitf0a76f360b3ced8ad8738fb1f726e3d67c491c7a
treec8898a058a1a177d1390b6aa7b76fa65ac8b264c
parentf839e13c5946c4d016655f1da2628d89529db456
drm/nouveau/kms: restore fbcon after display has been resumed

Under some complicated circumstances (boot, suspend, resume, attach
second display, suspend, resume, suspend, detach second display,
resume, suspend, attach second display, resume), the fb_set_suspend()
call can somehow result in a modeset being attempted before we're
ready for it and things blow up in fun ways.

Running display init first fixes the issue.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_drm.c
drivers/gpu/drm/nouveau/nouveau_fbcon.c
drivers/gpu/drm/nouveau/nouveau_fbcon.h