]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit - drivers/gpu/drm/nouveau/nouveau_drv.h
drm/nouveau: Handle fbcon suspend/resume in seperate worker
authorLyude Paul <lyude@redhat.com>
Thu, 12 Jan 2017 02:25:24 +0000 (21:25 -0500)
committerDave Airlie <airlied@redhat.com>
Fri, 27 Jan 2017 00:50:35 +0000 (10:50 +1000)
commit15266ae38fe09dae07bd8812cb7a7717b1e1d992
treeac35c6409b5abee4d9a3b7bcf84c6f3be78d2be0
parentcae9ff036eea577856d5b12860b4c79c5e71db4a
drm/nouveau: Handle fbcon suspend/resume in seperate worker

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>
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/nouveau/nouveau_fbcon.c