From 17390af7e7bf9bb3f357938df21dc120d5fb8fb8 Mon Sep 17 00:00:00 2001 From: Joo Costa Date: Thu, 15 Apr 2021 13:48:00 -0300 Subject: [PATCH] [Guam NA] Fix propagation error in dsi_display.c Fix conditions placement error in dsi_display_disable() and dsi_display_unprepare(), which were swapped probably due to a mistake during propagation. Now, the display turns on correctly and the moto extended dsi features can be used. The MMI_STOPSHIP will be removed from bengal-guamna-display.dtsi in a follow-up commit. Change-Id: If730caf231f74968037bffec89d04cb5656529a9 Signed-off-by: Joo Costa Reviewed-on: https://gerrit.mot.com/1925140 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Tiago Ganselli Reviewed-by: Sergio Vilela Reviewed-by: Carlos Pinho Submit-Approved: Sergio Vilela --- msm/dsi/dsi_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c index bb61e950f30d..bae28b81926d 100644 --- a/msm/dsi/dsi_display.c +++ b/msm/dsi/dsi_display.c @@ -8342,7 +8342,7 @@ int dsi_display_disable(struct dsi_display *display) //Check is Mot early power is on going pr_info("display %p, name %s is_dsi_mot_primary(%d)\n", display, display->name, display->is_dsi_mot_primary); - if ( display->is_dsi_mot_early_power_enabled && !display->is_dsi_display_prepared) { + if ( display->is_dsi_mot_early_power_enabled && !dsi_panel_initialized(display->panel)) { mutex_unlock(&display->display_lock); pr_info("panel already unprepared\n"); return rc; @@ -8412,7 +8412,7 @@ int dsi_display_unprepare(struct dsi_display *display) mutex_lock(&display->display_lock); //Check if Mot early power is on going - if ( display->is_dsi_mot_early_power_enabled && !dsi_panel_initialized(display->panel)) { + if ( display->is_dsi_mot_early_power_enabled && !display->is_dsi_display_prepared) { mutex_unlock(&display->display_lock); pr_info("panel already disabled\n"); return rc;