commit f8c14115ec4b02a1af33e90a1ec40f9fe59d8fa8
author Sasha McIntosh <sashamcintosh@google.com> Wed Dec 11 12:03:32 2024 -0500
committer Sasha McIntosh <sashamcintosh@google.com> Thu Jan 30 15:55:22 2025 -0500
tree 7d4d055435945597314f7beaf8a33ee9059e89fd
parent da080fe82d2fd0b8165a1fb818c44528a7ad95ff

drm_hwcomposer: Add wrapper for EDID parsing

Use libdisplay-info to parse display EDID. Wrap the parsing logic in a
class to extract specific EDID information.

Change-Id: I20376eb96ebcd0073155cedf1e8f055bbf8dfb49
Signed-off-by: Sasha McIntosh <sashamcintosh@google.com>

drm/DrmConnector.cpp

diff --git a/drm/DrmConnector.cpp b/drm/DrmConnector.cpp
index 6dbe3c5..6be4067 100644
--- a/drm/DrmConnector.cpp
+++ b/drm/DrmConnector.cpp
@@ -89,6 +89,12 @@
   }
 
   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
 
   if (IsWriteback() &&
       (!GetConnectorProperty("WRITEBACK_PIXEL_FORMATS",
@@ -128,7 +134,8 @@
                                       colorspace_enum_map_);
     colorspace_property_.AddEnumToMap("RGB_WIDE_FIXED", Colorspace::kRgbWideFixed,
                                       colorspace_enum_map_);
-    colorspace_property_.AddEnumToMap("RGB_WIDE_FLOAT", Colorspace::kRgbWideFloat,
+    colorspace_property_.AddEnumToMap("RGB_WIDE_FLOAT",
+                                      Colorspace::kRgbWideFloat,
                                       colorspace_enum_map_);
     colorspace_property_.AddEnumToMap("BT601_YCC", Colorspace::kBt601Ycc,
                                       colorspace_enum_map_);

drm/DrmConnector.h

diff --git a/drm/DrmConnector.h b/drm/DrmConnector.h
index e49cee0..fc17206 100644
--- a/drm/DrmConnector.h
+++ b/drm/DrmConnector.h
@@ -27,11 +27,14 @@
 #include "DrmProperty.h"
 #include "DrmUnique.h"
 #include "compositor/DisplayInfo.h"
+#include "utils/EdidWrapper.h"
 
 namespace android {
 
 class DrmDevice;
 
+using EdidWrapperUnique = std::unique_ptr<EdidWrapper>;
+
 class DrmConnector : public PipelineBindable<DrmConnector> {
  public:
   static auto CreateInstance(DrmDevice &dev, uint32_t connector_id,
@@ -42,6 +45,9 @@
 
   int UpdateEdidProperty();
   auto GetEdidBlob() -> DrmModePropertyBlobUnique;
+  auto GetParsedEdid() -> EdidWrapperUnique & {
+    return edid_wrapper_;
+  }
 
   auto GetDev() const -> DrmDevice & {
     return *drm_;
@@ -152,6 +158,8 @@
     return GetConnectorProperty(prop_name, property, /*is_optional=*/true);
   }
 
+  EdidWrapperUnique edid_wrapper_;
+
   const uint32_t index_in_res_array_;
 
   std::vector<DrmMode> modes_;