drm_hwcomposer: Fix missing present and release fence handling
- Use wrappers instead of exposed raw fd in the HwcDisplay API.
- Add fences to the HWC3 command stream.
Fixes: b864ccf845e5 ("drm_hwcomposer: Remove HWC2 usage for Present")
Change-Id: Iadfa39d9b3f58d1e542a1738f27809155fdbf3f6
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
diff --git a/hwc2_device/HwcDisplay.cpp b/hwc2_device/HwcDisplay.cpp
index ad5d177..a0c200e 100644
--- a/hwc2_device/HwcDisplay.cpp
+++ b/hwc2_device/HwcDisplay.cpp
@@ -408,20 +408,26 @@
}
auto HwcDisplay::PresentStagedComposition(
- int32_t *out_present_fence, std::vector<ReleaseFence> *out_release_fences)
- -> HWC2::Error {
- auto error = PresentDisplay(out_present_fence);
- if (error != HWC2::Error::None || *out_present_fence == -1) {
- return error;
+ SharedFd &out_present_fence, std::vector<ReleaseFence> &out_release_fences)
+ -> bool {
+ int out_fd = -1;
+ auto error = PresentDisplay(&out_fd);
+ out_present_fence = MakeSharedFd(out_fd);
+ if (error != HWC2::Error::None) {
+ return false;
+ }
+
+ if (!out_present_fence) {
+ return true;
}
for (auto &l : layers_) {
- if (!l.second.GetPriorBufferScanOutFlag() || !present_fence_) {
- continue;
+ if (l.second.GetPriorBufferScanOutFlag()) {
+ out_release_fences.emplace_back(l.first, out_present_fence);
}
- out_release_fences->emplace_back(l.first, DupFd(present_fence_));
}
- return error;
+
+ return true;
}
void HwcDisplay::SetPipeline(std::shared_ptr<DrmDisplayPipeline> pipeline) {