diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-01-08 08:56:51 +1000 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-02-03 14:01:45 -0500 |
| commit | ccafc9df447a3de7b5b88d246404d97f70f80d6f (patch) | |
| tree | 91cc51958b4894080c00f39328981106d61a4797 /drivers/gpu | |
| parent | 498b346868790663ef443951bb06a30a57b64b32 (diff) | |
drm/nouveau/kms: take mode_config mutex in connector hotplug path
[ Upstream commit 0a882cadbc63fd2da3994af7115b4ada2fcbd638 ]
fdo#93634
Signed-off-by: Ben Skeggs <bskeggs@redhat.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/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 3162040bc314..05490ef5a2aa 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -969,10 +969,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); } |