Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/radeon/radeon_device.c

+6 −4
Original line number Diff line number Diff line
@@ -1551,11 +1551,13 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon) 
	/* reset hpd state */

	radeon_hpd_init(rdev);

	/* blat the mode back in */

	if (fbcon) {

		drm_helper_resume_force_mode(dev);

		/* turn on display hw */

		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);

	return 0;