Commit ec9954fc authored by Dave Airlie's avatar Dave Airlie Committed by Christian König

drm/radeon: fix resuming mode in pm runtime resume path

For runtime pm we'd never suspend with the modesetting hw turned on,
so don't try and resume the modesetting hw, as that path will take
locks that the interface that is causing us to wake up might also
take.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 1d8eec8b
...@@ -1551,10 +1551,12 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon) ...@@ -1551,10 +1551,12 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon)
/* reset hpd state */ /* reset hpd state */
radeon_hpd_init(rdev); radeon_hpd_init(rdev);
/* blat the mode back in */ /* blat the mode back in */
drm_helper_resume_force_mode(dev); if (fbcon) {
/* turn on display hw */ drm_helper_resume_force_mode(dev);
list_for_each_entry(connector, &dev->mode_config.connector_list, head) { /* turn on display hw */
drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
}
} }
drm_kms_helper_poll_enable(dev); drm_kms_helper_poll_enable(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment