commit 15016c496c156efeab566d15a2582e3ab02c0cc1
author Drew Davenport <ddavenport@google.com> Fri Dec 13 15:13:28 2024 -0700
committer Drew Davenport <ddavenport@google.com> Mon Dec 16 17:53:54 2024 -0700
tree d61645826aaa57cc1c51bd7bf0ad054e075aa31e
parent b39a3f82f97576d20bf7e1c8e17f908241c5debf

drm_hwcomposer: Remove VSyncWorkerCallbacks

This struct is no longer needed.

Change-Id: I85880d028c8d1931eeb964f10bccd94ee5fa3a5b
Signed-off-by: Drew Davenport <ddavenport@google.com>

drm/VSyncWorker.cpp

diff --git a/drm/VSyncWorker.cpp b/drm/VSyncWorker.cpp
index afc3949..ac80da4 100644
--- a/drm/VSyncWorker.cpp
+++ b/drm/VSyncWorker.cpp
@@ -30,13 +30,10 @@
 
 namespace android {
 
-auto VSyncWorker::CreateInstance(std::shared_ptr<DrmDisplayPipeline> &pipe,
-                                 VSyncWorkerCallbacks &callbacks)
+auto VSyncWorker::CreateInstance(std::shared_ptr<DrmDisplayPipeline> &pipe)
     -> std::shared_ptr<VSyncWorker> {
   auto vsw = std::shared_ptr<VSyncWorker>(new VSyncWorker());
 
-  vsw->callbacks_ = callbacks;
-
   if (pipe) {
     vsw->high_crtc_ = pipe->crtc->Get()->GetIndexInResArray()
                       << DRM_VBLANK_HIGH_CRTC_SHIFT;
@@ -95,7 +92,6 @@
     const std::lock_guard<std::mutex> lock(mutex_);
     thread_exit_ = true;
     enabled_ = false;
-    callbacks_ = {};
   }
 
   cv_.notify_all();
@@ -188,14 +184,12 @@
                   (int64_t)vblank.reply.tval_usec * kUsToNsMul;
     }
 
-    decltype(callbacks_.out_event) callback;
     std::optional<VsyncTimestampCallback> vsync_callback;
 
     {
       const std::lock_guard<std::mutex> lock(mutex_);
       if (!enabled_)
         continue;
-      callback = callbacks_.out_event;
       if (enable_vsync_timestamps_) {
         last_vsync_timestamp_ = timestamp;
       }
@@ -205,10 +199,6 @@
     if (vsync_callback) {
       vsync_callback.value()(timestamp, vsync_period_ns_);
     }
-
-    if (callback)
-      callback(timestamp);
-
     last_timestamp_ = timestamp;
   }
 

drm/VSyncWorker.h

diff --git a/drm/VSyncWorker.h b/drm/VSyncWorker.h
index f1143e4..0809f48 100644
--- a/drm/VSyncWorker.h
+++ b/drm/VSyncWorker.h
@@ -26,10 +26,6 @@
 
 namespace android {
 
-struct VSyncWorkerCallbacks {
-  std::function<void(uint64_t /*timestamp*/)> out_event;
-};
-
 class VSyncWorker {
  public:
   using VsyncTimestampCallback = std::function<void(int64_t /*timestamp*/,
@@ -37,8 +33,7 @@
 
   ~VSyncWorker() = default;
 
-  auto static CreateInstance(std::shared_ptr<DrmDisplayPipeline> &pipe,
-                             VSyncWorkerCallbacks &callbacks)
+  auto static CreateInstance(std::shared_ptr<DrmDisplayPipeline> &pipe)
       -> std::shared_ptr<VSyncWorker>;
 
   // Set the expected vsync period.
@@ -67,8 +62,6 @@
   void UpdateVSyncControl();
   bool ShouldEnable() const;
 
-  VSyncWorkerCallbacks callbacks_;
-
   SharedFd drm_fd_;
   uint32_t high_crtc_ = 0;
 

hwc2_device/HwcDisplay.cpp

diff --git a/hwc2_device/HwcDisplay.cpp b/hwc2_device/HwcDisplay.cpp
index b39d8c5..ff8de47 100644
--- a/hwc2_device/HwcDisplay.cpp
+++ b/hwc2_device/HwcDisplay.cpp
@@ -313,10 +313,8 @@
 HWC2::Error HwcDisplay::Init() {
   ChosePreferredConfig();
 
-  auto vsw_callbacks = (VSyncWorkerCallbacks){};
-
   if (type_ != HWC2::DisplayType::Virtual) {
-    vsync_worker_ = VSyncWorker::CreateInstance(pipeline_, vsw_callbacks);
+    vsync_worker_ = VSyncWorker::CreateInstance(pipeline_);
     if (!vsync_worker_) {
       ALOGE("Failed to create event worker for d=%d\n", int(handle_));
       return HWC2::Error::BadDisplay;