drm/amdgpu: lock and unlock console only for amdgpu_fbdev_set_suspend [V4]
Subsystems (2)
PATCH 1/1 drm/amdgpu: lock and unlock console only for amdgpu_fbdev_set_suspend [V4]
[Why]
While the console_lock is held, console output will be buffered, till its unlocked it wont be emitted, hence its ideal to unlock sooner to enable debugging/detecting/fixing of any issue in the remaining sequence of events in resume path.
The concern here is about consoles other than fbcon on the device, e.g. a serial console
[How]
This patch restructures the console_lock, console_unlock around amdgpu_fbdev_set_suspend() and moves this new block appropriately.
V2: Kept amdgpu_fbdev_set_suspend after pci_set_power_state
V3: Updated the commit message to clarify the real concern that this patch
addresses.
V4: code clean-up.
Signed-off-by Shirish S <[email protected]>
Reviewed-by Michel Dänzer <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +6 -15
@@ -2720,15 +2720,12 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)if (dev->switch_power_state ==DRM_SWITCH_POWER_OFF )return 0 ; -if (fbcon) -console_lock (); -if (resume) {pci_set_power_state (dev->pdev,PCI_D0 );pci_restore_state (dev->pdev); r =pci_enable_device (dev->pdev);if (r) - goto unlock; +return r; }/* post card */
@@ -2741,7 +2738,7 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) r =amdgpu_device_ip_resume (adev);if (r) {DRM_ERROR ("amdgpu_device_ip_resume failed (%d).\n" , r); - goto unlock; +return r; }amdgpu_fence_driver_resume (adev);
@@ -2749,7 +2746,7 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) r =amdgpu_device_ip_late_init (adev);if (r) - goto unlock; +return r;/* pin cursors */ list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) {
@@ -2784,6 +2781,9 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) }drm_modeset_unlock_all (dev); } +console_lock (); +amdgpu_fbdev_set_suspend (adev,0 ); +console_unlock (); }drm_kms_helper_poll_enable (dev);
@@ -2807,15 +2807,6 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)#ifdef CONFIG_PM dev->dev->power.disable_depth--;#endif - -if (fbcon) -amdgpu_fbdev_set_suspend (adev,0 ); - -unlock: -if (fbcon) -console_unlock (); - -return r; }/**
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx