commit 9937054c7b2916364c22a401725adce481c45e10
author Ramakant Singh <ramakant@codeaurora.org> Tue Oct 15 11:54:39 2019 +0530
committer Rajavenu Kyatham <rkyatham@codeaurora.org> Wed Oct 16 15:31:20 2019 +0530
tree 70eab86a3f891976ee10cd34ebff91ec0785d032
parent 81d2b86fdea02fdad99e42ba5d4547443275d528

hwc: Reset all connected panels during ESD

Change-Id: I3603a1f4f9879d347990abefa83e1932da10929c
CRs-Fixed: 2532011

composer/hwc_display.cpp

diff --git a/composer/hwc_display.cpp b/composer/hwc_display.cpp
index af2a57f..7d6d9b7 100644
--- a/composer/hwc_display.cpp
+++ b/composer/hwc_display.cpp
@@ -1259,12 +1259,13 @@
       break;
     }
     case kInvalidateDisplay:
-    case kThermalEvent:
-    case kPanelDeadEvent: {
+    case kThermalEvent: {
       SEQUENCE_WAIT_SCOPE_LOCK(HWCSession::locker_[id_]);
       validated_ = false;
     } break;
+    case kPanelDeadEvent:
     case kDisplayPowerResetEvent: {
+      SEQUENCE_WAIT_SCOPE_LOCK(HWCSession::locker_[id_]);
       validated_ = false;
       if (event_handler_) {
         event_handler_->DisplayPowerReset();

sdm/libs/core/display_builtin.cpp

diff --git a/sdm/libs/core/display_builtin.cpp b/sdm/libs/core/display_builtin.cpp
index 81a27e1..c223ce2 100644
--- a/sdm/libs/core/display_builtin.cpp
+++ b/sdm/libs/core/display_builtin.cpp
@@ -134,11 +134,6 @@
   uint32_t new_mixer_height = 0;
   uint32_t display_width = display_attributes_.x_pixels;
   uint32_t display_height = display_attributes_.y_pixels;
-  if (reset_panel_) {
-    DLOGW("panel is in bad state, resetting the panel");
-    ResetPanel();
-    reset_panel_ = false;
-  }
 
   DTRACE_SCOPED();
   if (NeedsMixerReconfiguration(layer_stack, &new_mixer_width, &new_mixer_height)) {