Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0552f765 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/i915/mst: use reference counted connectors. (v3) 



Don't just free the connector when we get the destroy callback.

Drop a reference to it, and set it's mst_port to NULL so
no more mst work is done on it.

v2: core mst accepts NULLs fine. Cleanup EDID code properly.
v3: drop the extra reference we were taking.

Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent d2307dea

drivers/gpu/drm/i915/intel_dp_mst.c

+20 −23
Original line number Original line Diff line number Diff line
@@ -109,7 +109,7 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder) 




	DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);

	DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);





	drm_dp_mst_reset_vcpi_slots(&intel_dp->mst_mgr, intel_mst->port);

	drm_dp_mst_reset_vcpi_slots(&intel_dp->mst_mgr, intel_mst->connector->port);





	ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr);

	ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr);

	if (ret) {

	if (ret) {
@@ -134,10 +134,11 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder) 
	/* and this can also fail */

	/* and this can also fail */

	drm_dp_update_payload_part2(&intel_dp->mst_mgr);

	drm_dp_update_payload_part2(&intel_dp->mst_mgr);





	drm_dp_mst_deallocate_vcpi(&intel_dp->mst_mgr, intel_mst->port);

	drm_dp_mst_deallocate_vcpi(&intel_dp->mst_mgr, intel_mst->connector->port);





	intel_dp->active_mst_links--;

	intel_dp->active_mst_links--;

	intel_mst->port = NULL;



	intel_mst->connector = NULL;

	if (intel_dp->active_mst_links == 0) {

	if (intel_dp->active_mst_links == 0) {

		intel_dig_port->base.post_disable(&intel_dig_port->base);

		intel_dig_port->base.post_disable(&intel_dig_port->base);

		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);

		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
@@ -177,7 +178,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder) 
	found->encoder = encoder;

	found->encoder = encoder;





	DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);

	DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);

	intel_mst->port = found->port;



	intel_mst->connector = found;





	if (intel_dp->active_mst_links == 0) {

	if (intel_dp->active_mst_links == 0) {

		intel_prepare_ddi_buffer(&intel_dig_port->base);

		intel_prepare_ddi_buffer(&intel_dig_port->base);
@@ -195,7 +197,7 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder) 
	}

	}





	ret = drm_dp_mst_allocate_vcpi(&intel_dp->mst_mgr,

	ret = drm_dp_mst_allocate_vcpi(&intel_dp->mst_mgr,

				       intel_mst->port,

				       intel_mst->connector->port,

				       intel_crtc->config->pbn, &slots);

				       intel_crtc->config->pbn, &slots);

	if (ret == false) {

	if (ret == false) {

		DRM_ERROR("failed to allocate vcpi\n");

		DRM_ERROR("failed to allocate vcpi\n");
@@ -244,7 +246,7 @@ static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder, 
{

{

	struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);

	struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);

	*pipe = intel_mst->pipe;

	*pipe = intel_mst->pipe;

	if (intel_mst->port)

	if (intel_mst->connector)

		return true;

		return true;

	return false;

	return false;

}

}
@@ -308,10 +310,11 @@ static int intel_dp_mst_get_ddc_modes(struct drm_connector *connector) 
	struct edid *edid;

	struct edid *edid;

	int ret;

	int ret;





	edid = drm_dp_mst_get_edid(connector, &intel_dp->mst_mgr, intel_connector->port);

	if (!intel_dp) {

	if (!edid)

		return intel_connector_update_modes(connector, NULL);

		return 0;

	}





	edid = drm_dp_mst_get_edid(connector, &intel_dp->mst_mgr, intel_connector->port);

	ret = intel_connector_update_modes(connector, edid);

	ret = intel_connector_update_modes(connector, edid);

	kfree(edid);

	kfree(edid);
@@ -324,6 +327,8 @@ intel_dp_mst_detect(struct drm_connector *connector, bool force) 
	struct intel_connector *intel_connector = to_intel_connector(connector);

	struct intel_connector *intel_connector = to_intel_connector(connector);

	struct intel_dp *intel_dp = intel_connector->mst_port;

	struct intel_dp *intel_dp = intel_connector->mst_port;





	if (!intel_dp)

		return connector_status_disconnected;

	return drm_dp_mst_detect_port(connector, &intel_dp->mst_mgr, intel_connector->port);

	return drm_dp_mst_detect_port(connector, &intel_dp->mst_mgr, intel_connector->port);

}

}
@@ -389,6 +394,8 @@ static struct drm_encoder *intel_mst_atomic_best_encoder(struct drm_connector *c 
	struct intel_dp *intel_dp = intel_connector->mst_port;

	struct intel_dp *intel_dp = intel_connector->mst_port;

	struct intel_crtc *crtc = to_intel_crtc(state->crtc);

	struct intel_crtc *crtc = to_intel_crtc(state->crtc);





	if (!intel_dp)

		return NULL;

	return &intel_dp->mst_encoders[crtc->pipe]->base.base;

	return &intel_dp->mst_encoders[crtc->pipe]->base.base;

}

}
@@ -396,6 +403,8 @@ static struct drm_encoder *intel_mst_best_encoder(struct drm_connector *connecto 
{

{

	struct intel_connector *intel_connector = to_intel_connector(connector);

	struct intel_connector *intel_connector = to_intel_connector(connector);

	struct intel_dp *intel_dp = intel_connector->mst_port;

	struct intel_dp *intel_dp = intel_connector->mst_port;

	if (!intel_dp)

		return NULL;

	return &intel_dp->mst_encoders[0]->base.base;

	return &intel_dp->mst_encoders[0]->base.base;

}

}
@@ -506,23 +515,11 @@ static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr, 




	/* need to nuke the connector */

	/* need to nuke the connector */

	drm_modeset_lock_all(dev);

	drm_modeset_lock_all(dev);

	if (connector->state->crtc) {

		struct drm_mode_set set;

		int ret;



		memset(&set, 0, sizeof(set));

		set.crtc = connector->state->crtc,



		ret = drm_atomic_helper_set_config(&set);



		WARN(ret, "Disabling mst crtc failed with %i\n", ret);

	}



	intel_connector_remove_from_fbdev(intel_connector);

	intel_connector_remove_from_fbdev(intel_connector);

	drm_connector_cleanup(connector);

	intel_connector->mst_port = NULL;

	drm_modeset_unlock_all(dev);

	drm_modeset_unlock_all(dev);





	kfree(intel_connector);

	drm_connector_unreference(&intel_connector->base);

	DRM_DEBUG_KMS("\n");

	DRM_DEBUG_KMS("\n");

}

}

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -883,7 +883,7 @@ struct intel_dp_mst_encoder { 
	struct intel_encoder base;

	struct intel_encoder base;

	enum pipe pipe;

	enum pipe pipe;

	struct intel_digital_port *primary;

	struct intel_digital_port *primary;

	void *port; /* store this opaque as its illegal to dereference it */

	struct intel_connector *connector;

};

};





static inline enum dpio_channel

static inline enum dpio_channel