commit 6f0030f2bb023d99b919104c0331241761677801
author Alexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com> Tue May 01 17:25:48 2018 +0100
committer Alexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com> Fri Jul 13 15:36:44 2018 +0100
tree 5fdef7976c3c85f8d58be864d56afa22ce8672c9
parent c54635874b30efee98c7dd309cb54a8756a2094c

drm_hwcomposer: Pass resource manager to drmdisplaycompositor

Signed-off-by: Alexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com>

drmhwctwo.cpp

diff --git a/drmhwctwo.cpp b/drmhwctwo.cpp
index 56ba07b..a6b48e2 100644
--- a/drmhwctwo.cpp
+++ b/drmhwctwo.cpp
@@ -72,10 +72,10 @@
     return HWC2::Error::NoResources;
   }
 
-  displays_.emplace(std::piecewise_construct,
-                    std::forward_as_tuple(HWC_DISPLAY_PRIMARY),
-                    std::forward_as_tuple(drm, importer, HWC_DISPLAY_PRIMARY,
-                                          HWC2::DisplayType::Physical));
+  displays_.emplace(
+      std::piecewise_construct, std::forward_as_tuple(HWC_DISPLAY_PRIMARY),
+      std::forward_as_tuple(&resource_manager_, drm, importer,
+                            HWC_DISPLAY_PRIMARY, HWC2::DisplayType::Physical));
 
   DrmCrtc *crtc = drm->GetCrtcForDisplay(static_cast<int>(HWC_DISPLAY_PRIMARY));
   if (!crtc) {
@@ -152,10 +152,15 @@
   return HWC2::Error::None;
 }
 
-DrmHwcTwo::HwcDisplay::HwcDisplay(DrmDevice *drm,
+DrmHwcTwo::HwcDisplay::HwcDisplay(ResourceManager *resource_manager,
+                                  DrmDevice *drm,
                                   std::shared_ptr<Importer> importer,
                                   hwc2_display_t handle, HWC2::DisplayType type)
-    : drm_(drm), importer_(importer), handle_(handle), type_(type) {
+    : resource_manager_(resource_manager),
+      drm_(drm),
+      importer_(importer),
+      handle_(handle),
+      type_(type) {
   supported(__func__);
 }
 
@@ -168,7 +173,7 @@
   }
 
   int display = static_cast<int>(handle_);
-  int ret = compositor_.Init(drm_, display);
+  int ret = compositor_.Init(resource_manager_, drm_, display);
   if (ret) {
     ALOGE("Failed display compositor init for display %d (%d)", display, ret);
     return HWC2::Error::NoResources;