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

Commit 53cbf65c authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher
Browse files

drm/amd/display: Simplify handle_hpd_rx_irq() 



There is a local reference to the dc_link that wasn't being
used so we shorten references throughout the function.

Signed-off-by: default avatarTom St Denis <tom.stdenis@amd.com>
Acked-by: default avatarAndrey Grodzovsky <andey.grodzovsky@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d4a6e8a9

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

+6 −6
Original line number Diff line number Diff line
@@ -1024,20 +1024,20 @@ static void handle_hpd_rx_irq(void *param) 
	struct amdgpu_dm_connector *aconnector = (struct amdgpu_dm_connector *)param;

	struct drm_connector *connector = &aconnector->base;

	struct drm_device *dev = connector->dev;

	const struct dc_link *dc_link = aconnector->dc_link;

	struct dc_link *dc_link = aconnector->dc_link;

	bool is_mst_root_connector = aconnector->mst_mgr.mst_state;



	/* TODO:Temporary add mutex to protect hpd interrupt not have a gpio

	 * conflict, after implement i2c helper, this mutex should be

	 * retired.

	 */

	if (aconnector->dc_link->type != dc_connection_mst_branch)

	if (dc_link->type != dc_connection_mst_branch)

		mutex_lock(&aconnector->hpd_lock);



	if (dc_link_handle_hpd_rx_irq(aconnector->dc_link, NULL) &&

	if (dc_link_handle_hpd_rx_irq(dc_link, NULL) &&

			!is_mst_root_connector) {

		/* Downstream Port status changed. */

		if (dc_link_detect(aconnector->dc_link, DETECT_REASON_HPDRX)) {

		if (dc_link_detect(dc_link, DETECT_REASON_HPDRX)) {

			amdgpu_dm_update_connector_after_detect(aconnector);
@@ -1052,7 +1052,7 @@ static void handle_hpd_rx_irq(void *param) 
	    (dc_link->type == dc_connection_mst_branch))

		dm_handle_hpd_rx_irq(aconnector);



	if (aconnector->dc_link->type != dc_connection_mst_branch)

	if (dc_link->type != dc_connection_mst_branch)

		mutex_unlock(&aconnector->hpd_lock);

}