Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: Sprinkle drm_modeset_lock_all to appease locking checks

In

commit 7a3f3d6667f5f9ffd1517f6b21d64bbf5312042c
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 amdgpu resume/suspend code.

Fix them up.

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

Port of radeon commit:
drm/radeon: Sprinkle drm_modeset_lock_all to appease locking checks

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

+4
+4
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
··· 1651 1651 drm_kms_helper_poll_disable(dev); 1652 1652 1653 1653 /* turn off display hw */ 1654 + drm_modeset_lock_all(dev); 1654 1655 list_for_each_entry(connector, &dev->mode_config.connector_list, head) { 1655 1656 drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); 1656 1657 } 1658 + drm_modeset_unlock_all(dev); 1657 1659 1658 1660 /* unpin the front buffers */ 1659 1661 list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { ··· 1750 1748 if (fbcon) { 1751 1749 drm_helper_resume_force_mode(dev); 1752 1750 /* turn on display hw */ 1751 + drm_modeset_lock_all(dev); 1753 1752 list_for_each_entry(connector, &dev->mode_config.connector_list, head) { 1754 1753 drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); 1755 1754 } 1755 + drm_modeset_unlock_all(dev); 1756 1756 } 1757 1757 1758 1758 drm_kms_helper_poll_enable(dev);