diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-01-08 08:56:51 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-01-11 11:29:36 +1000 |
| commit | 0a882cadbc63fd2da3994af7115b4ada2fcbd638 (patch) | |
| tree | 859661a27045d3aff4250c6c6081d736efeb04c6 | |
| parent | 2e7db87dee8f4a731a560b1f6a2bc588f78823bf (diff) | |
| download | lwn-0a882cadbc63fd2da3994af7115b4ada2fcbd638.tar.gz lwn-0a882cadbc63fd2da3994af7115b4ada2fcbd638.zip | |
drm/nouveau/kms: take mode_config mutex in connector hotplug path
fdo#93634
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Cc: stable@vger.kernel.org
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 84e63b55037e..fcebfae5d426 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/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); } |