From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 7 Jan 2016 22:56:51 +0000 (+1000)
Subject: drm/nouveau/kms: take mode_config mutex in connector hotplug path
X-Git-Tag: v4.1.12-92~150^2~304
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=47b3fbab026453392951618b60488732913f336a;p=users%2Fjedix%2Flinux-maple.git

drm/nouveau/kms: take mode_config mutex in connector hotplug path

Orabug: 23330625

[ 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>
(cherry picked from commit ccafc9df447a3de7b5b88d246404d97f70f80d6f)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 3162040bc3148..05490ef5a2aa4 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);
 	}