Merge cff5b253c3 on remote branch

Change-Id: I23030be4c6caddc379da2652cd7cfda8b8a2bce7
This commit is contained in:
Linux Build Service Account
2023-05-16 10:07:53 -07:00
2 changed files with 5 additions and 1 deletions

View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
*/
@@ -2379,6 +2379,9 @@ static int dp_panel_deinit_panel_info(struct dp_panel *dp_panel, u32 flags)
shdr_if_sdp = &panel->catalog->shdr_if_sdp;
vsc_colorimetry = &panel->catalog->vsc_colorimetry;
/*clearing LINK INFO capabilities during disconnect*/
dp_panel->link_info.capabilities = 0;
if (dp_panel->edid_ctrl->edid)
sde_free_edid((void **)&dp_panel->edid_ctrl);

View File

@@ -919,6 +919,7 @@ static int dsi_display_status_check_te(struct dsi_display *display,
esd_te_timeout)) {
DSI_ERR("TE check failed\n");
dsi_display_change_te_irq_status(display, false);
dsi_display_release_te_irq(display);
return -EINVAL;
}
}