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

Commit e86e8947 authored by Hans Verkuil's avatar Hans Verkuil
Browse files

drm/amdgpu: add DisplayPort CEC-Tunneling-over-AUX support 



Add DisplayPort CEC-Tunneling-over-AUX support to amdgpu.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/de9586bb-151e-bae9-b8e3-14db107a60df@xs4all.nl
parent 46094b2b

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

+8 −1
Original line number Diff line number Diff line
@@ -896,6 +896,7 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector) 
		aconnector->dc_sink = sink;

		if (sink->dc_edid.length == 0) {

			aconnector->edid = NULL;

			drm_dp_cec_unset_edid(&aconnector->dm_dp_aux.aux);

		} else {

			aconnector->edid =

				(struct edid *) sink->dc_edid.raw_edid;
@@ -903,10 +904,13 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector) 


			drm_connector_update_edid_property(connector,

					aconnector->edid);

			drm_dp_cec_set_edid(&aconnector->dm_dp_aux.aux,

					    aconnector->edid);

		}

		amdgpu_dm_add_sink_to_freesync_module(connector, aconnector->edid);



	} else {

		drm_dp_cec_unset_edid(&aconnector->dm_dp_aux.aux);

		amdgpu_dm_remove_sink_from_freesync_module(connector);

		drm_connector_update_edid_property(connector, NULL);

		aconnector->num_modes = 0;
@@ -1061,9 +1065,11 @@ static void handle_hpd_rx_irq(void *param) 
	    (dc_link->type == dc_connection_mst_branch))

		dm_handle_hpd_rx_irq(aconnector);



	if (dc_link->type != dc_connection_mst_branch)

	if (dc_link->type != dc_connection_mst_branch) {

		drm_dp_cec_irq(&aconnector->dm_dp_aux.aux);

		mutex_unlock(&aconnector->hpd_lock);

	}

}



static void register_hpd_handlers(struct amdgpu_device *adev)

{
@@ -2731,6 +2737,7 @@ static void amdgpu_dm_connector_destroy(struct drm_connector *connector) 
		dm->backlight_dev = NULL;

	}

#endif

	drm_dp_cec_unregister_connector(&aconnector->dm_dp_aux.aux);

	drm_connector_unregister(connector);

	drm_connector_cleanup(connector);

	kfree(connector);

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

+2 −0
Original line number Diff line number Diff line
@@ -496,6 +496,8 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, 
	aconnector->dm_dp_aux.ddc_service = aconnector->dc_link->ddc;



	drm_dp_aux_register(&aconnector->dm_dp_aux.aux);

	drm_dp_cec_register_connector(&aconnector->dm_dp_aux.aux,

				      aconnector->base.name, dm->adev->dev);

	aconnector->mst_mgr.cbs = &dm_mst_cbs;

	drm_dp_mst_topology_mgr_init(

		&aconnector->mst_mgr,