From: Ben Skeggs Date: Fri, 4 Nov 2016 07:20:35 +0000 (+1000) Subject: drm/nouveau/kms: drop dpms off/on in response to hotplug X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d000edd36012e2bb921aa005e65ef990d81754da;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git drm/nouveau/kms: drop dpms off/on in response to hotplug This primarily existed to ensure the DP link got retrained, and is now unnecessary as that's handled by NVKM already. For anything beyond that, we send an event to userspace and let it decide on an appropriate action to take. Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index c1084088f9e4..1bdfb8f0f382 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -1001,14 +1001,6 @@ nouveau_connector_hotplug(struct nvif_notify *notify) bool plugged = (rep->mask != NVIF_NOTIFY_CONN_V0_UNPLUG); 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); }