]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/radeon: take the mode_config mutex when dealing with hpds (v2)
authorAlex Deucher <alexander.deucher@amd.com>
Fri, 15 May 2015 15:48:52 +0000 (11:48 -0400)
committerSasha Levin <sasha.levin@oracle.com>
Sat, 4 Jul 2015 03:02:20 +0000 (23:02 -0400)
[ 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>
drivers/gpu/drm/radeon/radeon_irq_kms.c

index 00fc59762e0df3bba0758d1f18e90328e5726635..bbcd754dc7d0a87a017304628321071456ee61be 100644 (file)
@@ -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);
 }