diff options
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 15f954cd81cb..835516d2d257 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c | |||
| @@ -1551,10 +1551,12 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon) | |||
| 1551 | /* reset hpd state */ | 1551 | /* reset hpd state */ |
| 1552 | radeon_hpd_init(rdev); | 1552 | radeon_hpd_init(rdev); |
| 1553 | /* blat the mode back in */ | 1553 | /* blat the mode back in */ |
| 1554 | drm_helper_resume_force_mode(dev); | 1554 | if (fbcon) { |
| 1555 | /* turn on display hw */ | 1555 | drm_helper_resume_force_mode(dev); |
| 1556 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { | 1556 | /* turn on display hw */ |
| 1557 | drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); | 1557 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
| 1558 | drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); | ||
| 1559 | } | ||
| 1558 | } | 1560 | } |
| 1559 | 1561 | ||
| 1560 | drm_kms_helper_poll_enable(dev); | 1562 | drm_kms_helper_poll_enable(dev); |