summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-01-08 08:56:51 +1000
committerBen Skeggs <bskeggs@redhat.com>2016-01-11 11:15:11 +1000
commit39ca4fc966feb45df76c5a9a5ae2cffd1c348f77 (patch)
treeccd71191596a590edc98395ba57698bd91000e5e
parent443c4f28445579bdf381166b8ad906ed394c8d96 (diff)
downloadnouveau-39ca4fc966feb45df76c5a9a5ae2cffd1c348f77.tar.gz
kms: take mode_config mutex in connector hotplug path
fdo#93634 Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drm/nouveau/nouveau_connector.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drm/nouveau/nouveau_connector.c b/drm/nouveau/nouveau_connector.c
index 84e63b550..fcebfae5d 100644
--- a/drm/nouveau/nouveau_connector.c
+++ b/drm/nouveau/nouveau_connector.c
@@ -983,10 +983,13 @@ nouveau_connector_hotplug(struct nvif_notify *notify)
NV_DEBUG(drm, "%splugged %s\n", plugged ? "" : "un", name);
+ mutex_lock(&drm->dev->mode_config.mutex);
if (plugged)
drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
else
drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
+ mutex_unlock(&drm->dev->mode_config.mutex);
+
drm_helper_hpd_irq_event(connector->dev);
}