commit 5951b111ce5bb879b9b4de989159292506fd9bb7
author Drew Davenport <ddavenport@chromium.org> Mon Aug 05 09:44:27 2024 -0600
committer Drew Davenport <ddavenport@chromium.org> Fri Aug 30 22:15:14 2024 +0000
tree 32e02dc32b8ce592810eb5ca35a76a34dc4ff3da
parent ade696579a1de5ac2dcec9f417203b0589cc86e8

drm_hwcomposer: Connect ComposerClient with HwcDisplay

Implements the HWC3 frontend by calling the HWC2 interfaces already
exposed through DrmHwc, HwcDisplay, HwcLayer, and so on.

Convert between hwc2 types and hwc3 types in ComposerClient.

The following changes from !238 were used as a basis for this change,
and squashed together:
(drm_hwcomposer: Connect ComposerClient with HwcDisplay)
(drm_hwcomposer: Implement HWC3 frontend by calling down to HWC2)

The projects [1, 2] were used as a reference for the implementation.

[1]: https://android.googlesource.com/platform/hardware/google/graphics/common/+/refs/heads/main/hwc3/
[2]: https://android.googlesource.com/device/generic/goldfish-opengl/+/refs/heads/master/system/hwc3/

Co-authored-by: Normunds Rieksts <normunds.rieksts@arm.com>
Co-authored-by: Dennis Tsiang <dennis.tsiang@arm.com>
Change-Id: I98c10175d5c5f01aec1e192863238e16aa1537ec
Signed-off-by: Drew Davenport <ddavenport@chromium.org>
Signed-off-by: Drew Davenport <ddavenport@google.com>

hwc3/DrmHwcThree.h

diff --git a/hwc3/DrmHwcThree.h b/hwc3/DrmHwcThree.h
index c2d4119..90e5f32 100644
--- a/hwc3/DrmHwcThree.h
+++ b/hwc3/DrmHwcThree.h
@@ -19,13 +19,16 @@
 #include <aidl/android/hardware/graphics/composer3/IComposerCallback.h>
 
 #include "drm/DrmHwc.h"
+#include "hwc3/ComposerResources.h"
 
 namespace aidl::android::hardware::graphics::composer3::impl {
 
 class DrmHwcThree : public ::android::DrmHwc {
  public:
-  DrmHwcThree() = default;
-  ~DrmHwcThree() override = default;
+  explicit DrmHwcThree(ComposerResources* composer_resources)
+      : composer_resources_(composer_resources) {
+  }
+  ~DrmHwcThree() override;
 
   void Init(std::shared_ptr<IComposerCallback> callback);
 
@@ -39,6 +42,11 @@
                                 bool connected) override;
 
  private:
+  void RemoveAndDestroyDisplay(uint64_t display_id);
+  void CleanDisplayResources(uint64_t display_id);
+  void HandleDisplayHotplugEvent(uint64_t display_id, bool connected);
+
   std::shared_ptr<IComposerCallback> composer_callback_;
+  ComposerResources* composer_resources_;
 };
 }  // namespace aidl::android::hardware::graphics::composer3::impl