drm/nouveau: make sure display hardware is reinitialised on runtime resume
authorBen Skeggs <bskeggs@redhat.com>
Thu, 2 Oct 2014 03:22:27 +0000 (13:22 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Thu, 2 Oct 2014 03:32:24 +0000 (13:32 +1000)
commit6fbb702e27d78ad2458df048b58cca3454bc0965
tree0b231d0faa47f6ffd47302f83292f29b4150ed86
parent634ffcccfbe59d77652804e1beb415d3329b1bc6
drm/nouveau: make sure display hardware is reinitialised on runtime resume

Linus commit 05c63c2ff23a80b654d6c088ac3ba21628db0173 modified the
runtime suspend/resume paths to skip over display-related tasks to
avoid locking issues on resume.

Unfortunately, this resulted in the display hardware being left in
a partially initialised state, preventing subsequent modesets from
completing.

This commit unifies the (many) suspend/resume paths, bringing back
display (and fbcon) handling in the runtime paths.

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