Reset HDR Pipeline When Hotplug

To ensure proper reset and reinitialization of the HDR (High Dynamic Range)
pipeline during hotplug events
(e.g., when a display connector is plugged or unplugged).
This prevents potential issues like stale HDR configurations persisting
across display changes.
The changes refactor EDID (Extended Display Identification Data) handling for
better modularity and add explicit HDR reset logic in the display
deinitialization and color mode switching paths. This improves reliability for
HDR-enabled displays during dynamic connector updates, such as in multi-monitor
setups or docking scenarios.

Test-done:
Verification was performed on a system with both SDR and HDR displays.
The displays were alternately hotplugged (inserted and removed) multiple
times to simulate dynamic scenarios.

Tracked-On: OAM-134602
Change-Id: I288792da7bdd93d2de1530e2f7e749a73bac9005
Signed-off-by: Kanli Hu <kanli.hu@intel.com>

Author: kanlihu

drm/DrmConnector.cpp

@@ -82,6 +82,16 @@ auto DrmConnector::CreateInstance(DrmDevice &dev, uint32_t connector_id,
   return c;
 }
 
+void DrmConnector::UpdateEdidWrapper() {
+  UpdateEdidProperty();
+#if HAS_LIBDISPLAY_INFO
+  auto edid = LibdisplayEdidWrapper::Create(GetEdidBlob());
+  edid_wrapper_ = edid ? std::move(edid) : std::make_unique<EdidWrapper>();
+#else
+  edid_wrapper_ = std::make_unique<EdidWrapper>();
+#endif
+}
+
 auto DrmConnector::Init()-> bool {
   if (!GetConnectorProperty("Content Protection", &hdcp_id_property_)) {
     ALOGE("%s GetHDCPConnectorProperty check failed!", __FUNCTION__);
@@ -95,13 +105,7 @@ auto DrmConnector::Init()-> bool {
     return false;
   }
 
-  UpdateEdidProperty();
-#if HAS_LIBDISPLAY_INFO
-  auto edid = LibdisplayEdidWrapper::Create(GetEdidBlob());
-  edid_wrapper_ = edid ? std::move(edid) : std::make_unique<EdidWrapper>();
-#else
-  edid_wrapper_ = std::make_unique<EdidWrapper>();
-#endif
+  UpdateEdidWrapper();
 
   if (IsWriteback() &&
       (!GetConnectorProperty("WRITEBACK_PIXEL_FORMATS",

drm/DrmConnector.h

@@ -44,6 +44,7 @@ class DrmConnector : public PipelineBindable<DrmConnector> {
   DrmConnector &operator=(const DrmProperty &) = delete;
 
   int UpdateEdidProperty();
+  void UpdateEdidWrapper();
   auto GetEdidBlob() -> DrmModePropertyBlobUnique;
   auto GetParsedEdid() -> EdidWrapperUnique & {
     return edid_wrapper_;

drm/ResourceManager.cpp

@@ -250,6 +250,7 @@ void ResourceManager::UpdateFrontendDisplays() {
 
   for (auto *conn : ordered_connectors) {
     conn->UpdateModes();
+    conn->UpdateEdidWrapper();
     auto connected = conn->IsConnected();
     auto attached = attached_pipelines_.count(conn) != 0;
 

hwc2_device/HwcDisplay.cpp

@@ -415,7 +415,6 @@ auto HwcDisplay::PresentStagedComposition(
 
 void HwcDisplay::SetPipeline(std::shared_ptr<DrmDisplayPipeline> pipeline) {
   Deinit();
-
   pipeline_ = std::move(pipeline);
 
   if (pipeline_ != nullptr || handle_ == kPrimaryDisplay) {
@@ -442,6 +441,7 @@ void HwcDisplay::Deinit() {
       flatcon_->StopThread();
       flatcon_.reset();
     }
+    ResetHdrPipelineInDisplay();
   }
 
   if (vsync_worker_) {
@@ -991,6 +991,14 @@ HWC2::Error HwcDisplay::SetActiveConfig(hwc2_config_t config) {
   return SetActiveConfigInternal(config, ResourceManager::GetTimeMonotonicNs());
 }
 
+void HwcDisplay::ResetHdrPipelineInDisplay() {
+  hdr_metadata_.reset();
+  hdr_degamma_lut_.reset();
+  hdr_gamma_lut_.reset();
+  SetColorMatrixToIdentity();
+  hdr_active_ = false;
+}
+
 HWC2::Error HwcDisplay::SetColorMode(int32_t mode) {
   ATRACE_CALL();
   /* Maps to the Colorspace DRM connector property:
@@ -1050,11 +1058,7 @@ HWC2::Error HwcDisplay::SetColorMode(int32_t mode) {
     }
     hdr_active_ = true;
   } else if (hdr_active_) {
-    hdr_degamma_lut_.reset();
-    hdr_gamma_lut_.reset();
-    SetColorMatrixToIdentity();
-    hdr_metadata_.reset();
-    hdr_active_ = false;
+    ResetHdrPipelineInDisplay();
   }
 
   color_mode_ = mode;