Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ddf5670 authored by Steven Thomas's avatar Steven Thomas
Browse files

Fix vr flinger post thread to resume correctly 

After being paused, the vr flinger post thread remained paused until it
was enabled by requesting display ownership, but the request for display
ownership was made from the vr flinger post thread, causing the post
thread to get stuck in the paused state forever. I moved the display
ownership request to the vr flinger dispatcher thread, so the post
thread can be resumed.

Bug: 62666511

Test: Put a device through a sleep/wake cycle and confirmed the vr
flinger post thread resumes as expected.

Change-Id: Ic57adb7376c8f2b5760bfaa4a5a30b58894a7ab7
parent b209c121

libs/vr/libvrflinger/hardware_composer.cpp

+3 −6
Original line number Diff line number Diff line
@@ -210,9 +210,6 @@ void HardwareComposer::UpdatePostThreadState(PostThreadStateType state, 
}



void HardwareComposer::OnPostThreadResumed() {

  if (request_display_callback_)

    request_display_callback_(true);



  hwc2_hidl_->resetCommands();



  // HIDL HWC seems to have an internal race condition. If we submit a frame too
@@ -249,9 +246,6 @@ void HardwareComposer::OnPostThreadPaused() { 


  // Trigger target-specific performance mode change.

  property_set(kDvrPerformanceProperty, "idle");



  if (request_display_callback_)

    request_display_callback_(false);

}



HWC::Error HardwareComposer::Validate(hwc2_display_t display) {
@@ -479,6 +473,9 @@ void HardwareComposer::SetDisplaySurfaces( 
    pending_surfaces_ = std::move(surfaces);

  }



  if (request_display_callback_)

    request_display_callback_(!display_idle);



  // Set idle state based on whether there are any surfaces to handle.

  UpdatePostThreadState(PostThreadState::Idle, display_idle);

}