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

Commit d2568976 authored by Lyude Paul's avatar Lyude Paul
Browse files

drm/amdgpu/display: Keep malloc ref to MST port 



Just like i915 and nouveau, it's a good idea for us to hold a malloc
reference to the port here so that we never pass a freed pointer to any
of the DP MST helper functions.

Also, we stop unsetting aconnector->port in
dm_dp_destroy_mst_connector(). There's literally no point to that
assignment that I can see anyway.

Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@redhat.com>
Cc: Jerry Zuo <Jerry.Zuo@amd.com>
Cc: Juston Li <juston.li@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190111005343.17443-12-lyude@redhat.com
parent 79a47cd3

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

+7 −4
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ dm_dp_mst_connector_destroy(struct drm_connector *connector) 
	drm_encoder_cleanup(&amdgpu_encoder->base);

	kfree(amdgpu_encoder);

	drm_connector_cleanup(connector);

	drm_dp_mst_put_port_malloc(amdgpu_dm_connector->port);

	kfree(amdgpu_dm_connector);

}
@@ -366,6 +367,8 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr, 
	DRM_INFO("DM_MST: added connector: %p [id: %d] [master: %p]\n",

		 aconnector, connector->base.id, aconnector->mst_port);



	drm_dp_mst_get_port_malloc(port);



	DRM_DEBUG_KMS(":%d\n", connector->base.id);



	return connector;
@@ -382,10 +385,10 @@ static void dm_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr, 
	DRM_INFO("DM_MST: Disabling connector: %p [id: %d] [master: %p]\n",

		 aconnector, connector->base.id, aconnector->mst_port);



	aconnector->port = NULL;

	if (aconnector->dc_sink) {

		amdgpu_dm_update_freesync_caps(connector, NULL);

		dc_link_remove_remote_sink(aconnector->dc_link, aconnector->dc_sink);

		dc_link_remove_remote_sink(aconnector->dc_link,

					   aconnector->dc_sink);

		dc_sink_release(aconnector->dc_sink);

		aconnector->dc_sink = NULL;

	}