https://github.com/torvalds/linux
Revision 15266ae38fe09dae07bd8812cb7a7717b1e1d992 authored by Lyude Paul on 12 January 2017, 02:25:24 UTC, committed by Dave Airlie on 27 January 2017, 00:50:35 UTC
Resuming from RPM can happen while already holding
dev->mode_config.mutex. This means we can't actually handle fbcon in
any RPM resume workers, since restoring fbcon requires grabbing
dev->mode_config.mutex again. So move the fbcon suspend/resume code into
it's own worker, and rely on that instead to avoid deadlocking.

This fixes more deadlocks for runtime suspending the GPU on the ThinkPad
W541. Reproduction recipe:

 - Get a machine with both optimus and a nvidia card with connectors
   attached to it
 - Wait for the nvidia GPU to suspend
 - Attempt to manually reprobe any of the connectors on the nvidia GPU
   using sysfs
 - *deadlock*

[airlied: use READ_ONCE to address Hans's comment]

Signed-off-by: Lyude <lyude@redhat.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Kilian Singer <kilian.singer@quantumtechnology.info>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: David Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
1 parent cae9ff0
History
Tip revision: 15266ae38fe09dae07bd8812cb7a7717b1e1d992 authored by Lyude Paul on 12 January 2017, 02:25:24 UTC
drm/nouveau: Handle fbcon suspend/resume in seperate worker
Tip revision: 15266ae
File Mode Size
kvm
lib
Makefile -rw-r--r-- 14 bytes

back to top