Merge "disp: msm: dp: set ctrl power_on flag when link clock is on" (3c7ee584) · Commits · e / devices / android_kernel_fairphone_FP4

msm/dp/dp_ctrl.c

+6 −3

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

		#include <linux/types.h>
		@@ -723,8 +723,10 @@ static int dp_ctrl_link_setup(struct dp_ctrl_private *ctrl, bool shallow)
		break;
		}

		if (!link_train_max_retries \|\| atomic_read(&ctrl->aborted))
		if (!link_train_max_retries \|\| atomic_read(&ctrl->aborted)) {
		dp_ctrl_disable_link_clock(ctrl);
		break;
		}

		if (rc != -EAGAIN)
		dp_ctrl_link_rate_down_shift(ctrl);
		@@ -1314,6 +1316,7 @@ static int dp_ctrl_on(struct dp_ctrl *dp_ctrl, bool mst_mode,
		ctrl->initial_bw_code = ctrl->link->link_params.bw_code;

		rc = dp_ctrl_link_setup(ctrl, shallow);
		if (!rc)
		ctrl->power_on = true;
		end:
		return rc;