Merge "disp: msm: dp: send dp hpd notification from attention_work" (8e80cfe9) · Commits · e / devices / android_kernel_fairphone_FP4

msm/dp/dp_display.c

+14 −12

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
		*/

		#include <linux/module.h>
		@@ -1365,9 +1365,15 @@ static void dp_display_attention_work(struct work_struct *work)
		mutex_unlock(&dp->session_lock);

		if (dp->link->sink_request & (DP_TEST_LINK_PHY_TEST_PATTERN \|
		DP_TEST_LINK_TRAINING)) {
		DP_TEST_LINK_TRAINING))
		goto mst_attention;
		} else {
		}

		cp_irq:
		if (dp_display_is_hdcp_enabled(dp) && dp->hdcp.ops->cp_irq)
		dp->hdcp.ops->cp_irq(dp->hdcp.data);

		if (!dp->mst.mst_active) {
		/*
		* It is possible that the connect_work skipped sending
		* the HPD notification if the attention message was
		@@ -1377,11 +1383,7 @@ static void dp_display_attention_work(struct work_struct *work)
		*/
		dp_display_send_hpd_notification(dp);
		}
		}

		cp_irq:
		if (dp_display_is_hdcp_enabled(dp) && dp->hdcp.ops->cp_irq)
		dp->hdcp.ops->cp_irq(dp->hdcp.data);
		mst_attention:
		dp_display_mst_attention(dp);
		SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state);