Skip to contentSkip to conversation

drm/amd: fix hotplug race at startup

PATCH In review Young Xiao 2 participants 2 messages Jun 14, 2019

Subsystems (2)
lore
Share & tools
lore

Young Xiao

author
#0 lore raw

PATCH 1/1 drm/amd: fix hotplug race at startup

We should check mode_config_initialized flag in amdgpu_hotplug_work_func.

See commit 7f98ca454ad3 ("drm/radeon: fix hotplug race at startup") for details.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +3 -0
index af4c3b1..13186d6 100644
@@ -85,6 +85,9 @@ static void amdgpu_hotplug_work_func(struct work_struct *work)
 	struct drm_mode_config *mode_config = &dev->mode_config;
 	struct drm_connector *connector;
 
+	if (!adev->mode_info.mode_config_initialized)
+		return;
+
 	mutex_lock(&mode_config->mutex);
 	list_for_each_entry(connector, &mode_config->connector_list, head)
 		amdgpu_connector_hotplug(connector);
Signature · 1 line
2.7.4
#1 lore raw
Quoted 14 lines · Young Xiao

We should check mode_config_initialized flag in amdgpu_hotplug_work_func.

See commit 7f98ca454ad3 ("drm/radeon: fix hotplug race at startup") for details.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +0 -0
index af4c3b1..13186d6 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c static void amdgpu_hotplug_work_func(struct work_struct *work) · line 89

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +2 -0
@@ -85,6 +85,9 @@ static void amdgpu_hotplug_work_func(struct work_struct *work)
 	struct drm_mode_config *mode_config = &dev->mode_config;
 	struct drm_connector *connector;
 
+	if (!adev->mode_info.mode_config_initialized)
+		return;

I think you want to delay your hotplug initialization until you're ready to serve hotplug events, this here is fairly racy ... -Daniel

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +1 -0
+
 	mutex_lock(&mode_config->mutex);
 	list_for_each_entry(connector, &mode_config->connector_list, head)
 		amdgpu_connector_hotplug(connector);
Signature · 1 line
2.7.4
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx