drm/nouveau: make sure display hardware is reinitialised on runtime resume

Browse source

commit 6fbb702e27 upstream.

Linus commit 05c63c2ff2 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>
Cc: Sven Joachim <svenjoac@gmx.de>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>

...

This commit is contained in:

Ben Skeggs 2014-10-02 13:22:27 +10:00 • committed by Luis Henriques

parent e909d63430

commit 2158205ac6

3 changed files with 26 additions and 53 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

23

drivers/gpu/drm/nouveau/nouveau_display.c

View file

5

drivers/gpu/drm/nouveau/nouveau_display.h

View file

51

drivers/gpu/drm/nouveau/nouveau_drm.c

View file