diff options
| author | JohnnLee <johnnlee@google.com> | 2022-12-21 12:02:43 +0800 |
|---|---|---|
| committer | JohnnLee <johnnlee@google.com> | 2022-12-21 12:03:03 +0800 |
| commit | ca74909cd98764454a2dacf784cda119c45a7f4c (patch) | |
| tree | 099522b6c54198415c4686b12c0bd8c2923d5529 | |
| parent | 6fce83dcbd6fddd0773f695bf488a2f28167bb0a (diff) | |
| parent | 4d929d41f9befed499b2306b80068f5575c7cfb8 (diff) | |
| download | display-drivers-android-msm-redbull-4.19-android14-qpr2-beta.tar.gz | |
Merge branch 'LA.UM.9.12.C10.11.00.00.840.478' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19android-u-qpr3-beta-2_r0.1android-u-qpr3-beta-2.1_r0.6android-u-qpr3-beta-1_r0.6android-u-qpr2-beta-3_r0.1android-u-qpr2-beta-3.1_r0.6android-u-qpr2-beta-1_r0.8android-u-qpr1-beta-1_r0.6android-u-preview-2_r0.1android-u-beta-5_r0.6android-u-beta-5.3_r0.6android-u-beta-5.2_r0.2android-u-beta-4_r0.6android-u-beta-3_r0.1android-u-beta-2_r0.1android-u-beta-2.1_r0.1android-u-beta-1_r0.2android-14.0.0_r0.68android-14.0.0_r0.58android-14.0.0_r0.47android-14.0.0_r0.46android-14.0.0_r0.32android-14.0.0_r0.20android-14.0.0_r0.12android-14.0.0_r0.1android-msm-redbull-4.19-u-preview-2android-msm-redbull-4.19-u-beta5.3android-msm-redbull-4.19-u-beta5.2android-msm-redbull-4.19-u-beta5android-msm-redbull-4.19-u-beta4android-msm-redbull-4.19-u-beta3android-msm-redbull-4.19-u-beta2android-msm-redbull-4.19-u-beta1android-msm-redbull-4.19-android14-releaseandroid-msm-redbull-4.19-android14-qpr3-betaandroid-msm-redbull-4.19-android14-qpr2-betaandroid-msm-redbull-4.19-android14-qpr2android-msm-redbull-4.19-android14-qpr1-betaandroid-msm-redbull-4.19-android14-qpr1android-msm-redbull-4.19-android14
Bug: 261541074
Change-Id: I92c4233b786e0681ee6e236334481486e5563637
Signed-off-by: JohnnLee <johnnlee@google.com>
| -rw-r--r-- | msm/dp/dp_catalog.c | 8 | ||||
| -rw-r--r-- | msm/dsi/dsi_drm.c | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/msm/dp/dp_catalog.c b/msm/dp/dp_catalog.c index f67302bb..de64dc2c 100644 --- a/msm/dp/dp_catalog.c +++ b/msm/dp/dp_catalog.c @@ -1,6 +1,7 @@ // 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); diff --git a/msm/dsi/dsi_drm.c b/msm/dsi/dsi_drm.c index 9ea51375..f1f14a5d 100644 --- a/msm/dsi/dsi_drm.c +++ b/msm/dsi/dsi_drm.c @@ -180,7 +180,8 @@ static void dsi_bridge_pre_enable(struct drm_bridge *bridge) return; } - atomic_set(&c_bridge->display->panel->esd_recovery_pending, 0); + 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 */ rc = dsi_display_set_mode(c_bridge->display, |