drm/radeon: Do not acquire console lock during suspend/resume
Subsystems (2)
cover drm/radeon: Do not acquire console lock during suspend/resume
Radeon is the only driver acquiring the console lock on suspend and resume by itself. This creates cyclic locking dependencies with the client-list mutex.
Drop the console locking from radeon and let fbdev client handle the console locking as necessary. Adopts the behavior of all other DRM drivers. Fixes the cyclic locking.
Tested by repeatedly suspeding/resuming on Radeon HD 6570.
Thomas Zimmermann (2):
drm/radeon: Do not hold console lock while suspending clients drm/radeon: Do not hold console lock during resume
drivers/gpu/drm/radeon/radeon_device.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-)
Signature · 1 line
2.50.0
PATCH 1/2 drm/radeon: Do not hold console lock while suspending clients
The radeon driver holds the console lock while suspending in-kernel DRM clients. This creates a circular dependency with the client-list mutex, which is supposed to be acquired first. Reported when combining radeon with another DRM driver.
Therefore, do not take the console lock in radeon, but let the fbdev DRM client acquire the lock when needed. This is what all other DRM drivers so.
--- drivers/gpu/drm/radeon/radeon_device.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/radeon/radeon_device.c +3 -5
@@ -1635,11 +1635,9 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend,pci_set_power_state (pdev, PCI_D3hot); } -if (notify_clients) { -console_lock (); -drm_client_dev_suspend (dev, true); -console_unlock (); - } +if (notify_clients) +drm_client_dev_suspend (dev, false); +return 0 ; }
Signature · 1 line
2.50.0
Alex Deucher
AppliedRe: [PATCH 1/2] drm/radeon: Do not hold console lock while suspending clients
Applied the series. Thanks!
Alex
Quoted 40 lines · Thomas Zimmermann
The radeon driver holds the console lock while suspending in-kernel DRM clients. This creates a circular dependency with the client-list mutex, which is supposed to be acquired first. Reported when combining radeon with another DRM driver.
Therefore, do not take the console lock in radeon, but let the fbdev DRM client acquire the lock when needed. This is what all other DRM drivers so.
Signed-off-by Thomas Zimmermann <[email protected]>Reported-by Jeff Johnson <[email protected]>Suggested-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/radeon/radeon_device.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)drivers/gpu/drm/radeon/radeon_device.c +3
-6@@ -1635,11 +1635,9 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend,pci_set_power_state (pdev, PCI_D3hot); } -if (notify_clients) { -console_lock (); -drm_client_dev_suspend (dev, true); -console_unlock (); - } +if (notify_clients) +drm_client_dev_suspend (dev, false); +return 0 ; } --2.50.0
PATCH 2/2 drm/radeon: Do not hold console lock during resume
In reply to Thomas ZimmermannThe function radeon_resume_kms() acquires the console lock. It is inconsistent, as it depends on the notify_client argument. That lock then covers a number of suspend operations that are unrelated to the console.
Remove the calls to console_lock() and console_unlock() from the radeon function. The console lock is only required by DRM's fbdev emulation, which acquires it as necessary.
Also fixes a possible circular dependency between the console lock and the client-list mutex, where the mutex is supposed to be taken first.
--- drivers/gpu/drm/radeon/radeon_device.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)
drivers/gpu/drm/radeon/radeon_device.c +3 -12
@@ -26,7 +26,6 @@* Jerome Glisse */ -#include <linux/console.h> #include <linux/efi.h> #include <linux/pci.h> #include <linux/pm_runtime.h>
@@ -1659,17 +1658,11 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool notify_clients)if (dev->switch_power_state ==DRM_SWITCH_POWER_OFF )return 0 ; -if (notify_clients) { -console_lock (); - }if (resume) {pci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -if (pci_enable_device (pdev)) { -if (notify_clients) -console_unlock (); +if (pci_enable_device (pdev))return -1 ; - } }/* resume AGP if in use */ radeon_agp_resume (rdev);
@@ -1745,10 +1738,8 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool notify_clients)if ((rdev->pm.pm_method ==PM_METHOD_DPM ) && rdev->pm.dpm_enabled)radeon_pm_compute_clocks (rdev); -if (notify_clients) { -drm_client_dev_resume (dev, true); -console_unlock (); - } +if (notify_clients) +drm_client_dev_resume (dev, false);return 0 ; }
Signature · 1 line
2.50.0