Merge remote-tracking branch 'origin/Bitra.LA.3.2.1-target' into fp4t-target-0414 (75a4a60a) · Commits · e / devices / android_kernel_fairphone_FP4

msm/dp/dp_catalog.c

+7 −1

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


		@@ -986,7 +987,12 @@ static void dp_catalog_ctrl_config_ctrl(struct dp_catalog_ctrl *ctrl, u8 ln_cnt)
		io_data = catalog->io.dp_link;

		cfg = dp_read(DP_CONFIGURATION_CTRL);
		cfg &= ~(BIT(4) \| BIT(5));
		/*
		* Reset ASSR (alternate scrambler seed reset) by resetting BIT(10).
		* ASSR should be set to disable for TPS4 link training pattern.
		* Forcing it to 0 as the power on reset value of register enables it.
		*/
		cfg &= ~(BIT(4) \| BIT(5) \| BIT(10));
		cfg \|= (ln_cnt - 1) << 4;
		dp_write(DP_CONFIGURATION_CTRL, cfg);

+2 −1

Original line number	Diff line number	Diff line
		@@ -176,6 +176,7 @@ static void dsi_bridge_pre_enable(struct drm_bridge *bridge)
		return;
		}

		if (bridge->encoder->crtc->state->active_changed)
		atomic_set(&c_bridge->display->panel->esd_recovery_pending, 0);

		/* By this point mode should have been validated through mode_fixup */