Merge "hwc: Reset all connected panels during ESD"
diff --git a/composer/hwc_display.cpp b/composer/hwc_display.cpp
index ef30b01..38daad0 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();
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)) {