summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2015-05-15 11:48:52 -0400
committerSasha Levin <sasha.levin@oracle.com>2015-07-03 23:02:20 -0400
commitc966a8dd2a86324785b8a92377c6cc3fe24da33a (patch)
tree638a5b5ba0e3b044f9a9b6ed50e7eeea9003502d /drivers/gpu
parent37469346a544addd00a3a0d18bfd16ea0e865519 (diff)
downloadlwn-c966a8dd2a86324785b8a92377c6cc3fe24da33a.tar.gz
lwn-c966a8dd2a86324785b8a92377c6cc3fe24da33a.zip
drm/radeon: take the mode_config mutex when dealing with hpds (v2)
[ Upstream commit 39fa10f7e21574a70cecf1fed0f9b36535aa68a0 ] Since we are messing with state in the worker. v2: drop the changes in the mst worker Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/radeon/radeon_irq_kms.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c
index 00fc59762e0d..bbcd754dc7d0 100644
--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c
@@ -79,10 +79,12 @@ static void radeon_hotplug_work_func(struct work_struct *work)
struct drm_mode_config *mode_config = &dev->mode_config;
struct drm_connector *connector;
+ mutex_lock(&mode_config->mutex);
if (mode_config->num_connector) {
list_for_each_entry(connector, &mode_config->connector_list, head)
radeon_connector_hotplug(connector);
}
+ mutex_unlock(&mode_config->mutex);
/* Just fire off a uevent and let userspace tell us what to do */
drm_helper_hpd_irq_event(dev);
}