diff --git a/hwc2_device/HwcDisplay.cpp b/hwc2_device/HwcDisplay.cpp
index e02019d..3f00fbf 100644
--- a/hwc2_device/HwcDisplay.cpp
+++ b/hwc2_device/HwcDisplay.cpp
@@ -501,7 +501,7 @@
 
   a_args.composition = current_plan_;
 
-  int ret = GetPipe().compositor->ExecuteAtomicCommit(a_args);
+  int ret = GetPipe().atomic_state_manager->ExecuteAtomicCommit(a_args);
 
   if (ret) {
     if (!a_args.test_only)
@@ -655,7 +655,7 @@
        * true, as the next composition frame will implicitly activate
        * the display
        */
-      return GetPipe().compositor->ActivateDisplayUsingDPMS() == 0
+      return GetPipe().atomic_state_manager->ActivateDisplayUsingDPMS() == 0
                  ? HWC2::Error::None
                  : HWC2::Error::BadParameter;
       break;
@@ -667,7 +667,7 @@
       return HWC2::Error::BadParameter;
   };
 
-  int err = GetPipe().compositor->ExecuteAtomicCommit(a_args);
+  int err = GetPipe().atomic_state_manager->ExecuteAtomicCommit(a_args);
   if (err) {
     ALOGE("Failed to apply the dpms composition err=%d", err);
     return HWC2::Error::BadParameter;