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

Commit 6adaed5b authored by Daniel Vetter's avatar Daniel Vetter Committed by Alex Deucher
Browse files

drm/radeon: Sprinkle drm_modeset_lock_all to appease locking checks 



In

commit 7a3f3d66
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Thu Jul 9 23:44:28 2015 +0200

    drm: Check locking in drm_for_each_connector

I added locking checks to drm_for_each_connector but failed that
through drm_helper_connector_dpms -> drm_helper_choose_encoder_dpms
it's used in a few more places in the radeon resume/suspend code.

Fix them up.

Note that we could use the connector iterator macros in there too, but
that's for the future.

Reported-and-tested-by: default avatarBorislav Petkov <bp@alien8.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5c3422b0

drivers/gpu/drm/radeon/radeon_device.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -1573,10 +1573,12 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend, bool fbcon) 




	drm_kms_helper_poll_disable(dev);

	drm_kms_helper_poll_disable(dev);





	drm_modeset_lock_all(dev);

	/* turn off display hw */

	/* turn off display hw */

	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

		drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);

		drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);

	}

	}

	drm_modeset_unlock_all(dev);





	/* unpin the front buffers and cursors */

	/* unpin the front buffers and cursors */

	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
@@ -1734,9 +1736,11 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon) 
	if (fbcon) {

	if (fbcon) {

		drm_helper_resume_force_mode(dev);

		drm_helper_resume_force_mode(dev);

		/* turn on display hw */

		/* turn on display hw */

		drm_modeset_lock_all(dev);

		list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

		list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

			drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);

			drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);

		}

		}

		drm_modeset_unlock_all(dev);

	}

	}





	drm_kms_helper_poll_enable(dev);

	drm_kms_helper_poll_enable(dev);