drm/nouveau: Resume hotplug interrupts earlier (ac0de16a) · Commits · 戴 / test

Currently, we enable hotplug detection only after we re-enable the display. However, this is too late if we're planning on sending sideband messages during the resume process - which we'll need to do in order to reprobe the topology on resume. So, enable hotplug events before reinitializing the display. Cc: Juston Li <juston.li@intel.com> Cc: Imre Deak <imre.deak@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Harry Wentland <hwentlan@amd.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by:

Sean Paul <sean@poorly.run> Signed-off-by:

Lyude Paul <lyude@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20191022023641.8026-11-lyude@redhat.com

drivers/gpu/drm/nouveau/nouveau_display.c

+11 −8

Original line number	Original line	Diff line number	Diff line
	@@ -407,6 +407,17 @@ nouveau_display_init(struct drm_device *dev, bool resume, bool runtime)
	struct drm_connector_list_iter conn_iter;		struct drm_connector_list_iter conn_iter;
	int ret;		int ret;

			/*
			* Enable hotplug interrupts (done as early as possible, since we need
			* them for MST)
			*/
			drm_connector_list_iter_begin(dev, &conn_iter);
			nouveau_for_each_non_mst_connector_iter(connector, &conn_iter) {
			struct nouveau_connector *conn = nouveau_connector(connector);
			nvif_notify_get(&conn->hpd);
			}
			drm_connector_list_iter_end(&conn_iter);

	ret = disp->init(dev, resume, runtime);		ret = disp->init(dev, resume, runtime);
	if (ret)		if (ret)
	return ret;		return ret;
	@@ -416,14 +427,6 @@ nouveau_display_init(struct drm_device *dev, bool resume, bool runtime)
	*/		*/
	drm_kms_helper_poll_enable(dev);		drm_kms_helper_poll_enable(dev);

	/* enable hotplug interrupts */
	drm_connector_list_iter_begin(dev, &conn_iter);
	nouveau_for_each_non_mst_connector_iter(connector, &conn_iter) {
	struct nouveau_connector *conn = nouveau_connector(connector);
	nvif_notify_get(&conn->hpd);
	}
	drm_connector_list_iter_end(&conn_iter);

	return ret;		return ret;
	}		}

Admin message