From 065492543682b85b4dcc14d9ccb3c83501627326 Mon Sep 17 00:00:00 2001 From: Rajat Gupta Date: Tue, 12 Jan 2021 14:33:33 +0530 Subject: [PATCH] disp: msm: dp: fix to handle host ready failues Handle host_ready failures and try to initialize host if not already. Sometimes customizations for customers causes NOC error as host_ready doesn't return early upon failure and the customer customization tries to access aux register to reconfig upon aux failure while reading EDID. Adding fix will make driver more robust to handle such cases. Change-Id: Ifa5c56daa32c4ef366a0e05718495ffcb40b96b3 Signed-off-by: Rajat Gupta --- msm/dp/dp_display.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/msm/dp/dp_display.c b/msm/dp/dp_display.c index e5c42a96be2e..82276d72d3a9 100644 --- a/msm/dp/dp_display.c +++ b/msm/dp/dp_display.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved. */ #include @@ -1053,16 +1053,21 @@ error_ctrl: return rc; } -static void dp_display_host_ready(struct dp_display_private *dp) +static int dp_display_host_ready(struct dp_display_private *dp) { + int rc = 0; + if (!dp_display_state_is(DP_STATE_INITIALIZED)) { - dp_display_state_show("[not initialized]"); - return; + rc = dp_display_host_init(dp); + if (rc) { + dp_display_state_show("[not initialized]"); + return rc; + } } if (dp_display_state_is(DP_STATE_READY)) { dp_display_state_log("[already ready]"); - return; + return rc; } /* @@ -1090,6 +1095,7 @@ static void dp_display_host_ready(struct dp_display_private *dp) dp_display_state_add(DP_STATE_READY); /* log this as it results from user action of cable connection */ DP_INFO("[OK]\n"); + return rc; } static void dp_display_host_unready(struct dp_display_private *dp) @@ -1192,7 +1198,11 @@ static int dp_display_process_hpd_high(struct dp_display_private *dp) dp_display_state_remove(DP_STATE_SRC_PWRDN); } - dp_display_host_ready(dp); + rc = dp_display_host_ready(dp); + if (rc) { + dp_display_state_show("[ready failed]"); + goto end; + } dp->link->psm_config(dp->link, &dp->panel->link_info, false); dp->debug->psm_enabled = false; @@ -2209,7 +2219,12 @@ static int dp_display_prepare(struct dp_display *dp_display, void *panel) } /* For supporting DP_PANEL_SRC_INITIATED_POWER_DOWN case */ - dp_display_host_ready(dp); + rc = dp_display_host_ready(dp); + + if (rc) { + dp_display_state_show("[ready failed]"); + goto end; + } if (dp->debug->psm_enabled) { dp->link->psm_config(dp->link, &dp->panel->link_info, false);