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

Commit c7b8de00 authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

drm/amd/display: Don't read EDID in atomic_check 



We shouldn't attempt to read EDID in atomic_check. We really shouldn't
even be modifying the connector object, or any other non-state object,
but this is a start at least.

Moving EDID cleanup to dm_dp_mst_connector_destroy from
dm_dp_destroy_mst_connector to ensure the EDID is still available for
headless mode.

Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent f2877656

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

+10 −22
Original line number Diff line number Diff line
@@ -161,6 +161,11 @@ dm_dp_mst_connector_destroy(struct drm_connector *connector) 
	struct amdgpu_dm_connector *amdgpu_dm_connector = to_amdgpu_dm_connector(connector);

	struct amdgpu_encoder *amdgpu_encoder = amdgpu_dm_connector->mst_encoder;



	if (amdgpu_dm_connector->edid) {

		kfree(amdgpu_dm_connector->edid);

		amdgpu_dm_connector->edid = NULL;

	}



	drm_encoder_cleanup(&amdgpu_encoder->base);

	kfree(amdgpu_encoder);

	drm_connector_cleanup(connector);
@@ -181,28 +186,22 @@ static const struct drm_connector_funcs dm_dp_mst_connector_funcs = { 
void dm_dp_mst_dc_sink_create(struct drm_connector *connector)

{

	struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);

	struct edid *edid;

	struct dc_sink *dc_sink;

	struct dc_sink_init_data init_params = {

			.link = aconnector->dc_link,

			.sink_signal = SIGNAL_TYPE_DISPLAY_PORT_MST };



	/* FIXME none of this is safe. we shouldn't touch aconnector here in

	 * atomic_check

	 */



	/*

	 * TODO: Need to further figure out why ddc.algo is NULL while MST port exists

	 */

	if (!aconnector->port || !aconnector->port->aux.ddc.algo)

		return;



	edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port);



	if (!edid) {

		drm_mode_connector_update_edid_property(

			&aconnector->base,

			NULL);

		return;

	}



	aconnector->edid = edid;

	ASSERT(aconnector->edid);



	dc_sink = dc_link_add_remote_sink(

		aconnector->dc_link,
@@ -215,9 +214,6 @@ void dm_dp_mst_dc_sink_create(struct drm_connector *connector) 


	amdgpu_dm_add_sink_to_freesync_module(

			connector, aconnector->edid);



	drm_mode_connector_update_edid_property(

					&aconnector->base, aconnector->edid);

}



static int dm_dp_mst_get_modes(struct drm_connector *connector)
@@ -424,14 +420,6 @@ static void dm_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr, 
		dc_sink_release(aconnector->dc_sink);

		aconnector->dc_sink = NULL;

	}

	if (aconnector->edid) {

		kfree(aconnector->edid);

		aconnector->edid = NULL;

	}



	drm_mode_connector_update_edid_property(

			&aconnector->base,

			NULL);



	aconnector->mst_connected = false;

}