drm_hwcomposer: Remove AtomicCommitArgs::clear_active_composition field
Now we can use empty DrmKmsPlan to achieve the same goal.
+ Remove unused HwcDisplay::ClearDisplay()
Signed-off-by: Roman Stratiienko <roman.o.stratiienko@globallogic.com>
diff --git a/compositor/DrmDisplayCompositor.cpp b/compositor/DrmDisplayCompositor.cpp
index 5be2941..e588b7f 100644
--- a/compositor/DrmDisplayCompositor.cpp
+++ b/compositor/DrmDisplayCompositor.cpp
@@ -58,11 +58,6 @@
args.active = true;
}
- if (args.clear_active_composition && args.composition) {
- ALOGE("%s: Invalid arguments", __func__);
- return -EINVAL;
- }
-
auto new_frame_state = NewFrameState();
auto *drm = pipe_->device;
@@ -126,12 +121,7 @@
}
}
- if (args.clear_active_composition) {
- new_frame_state.used_framebuffers.clear();
- new_frame_state.used_planes.clear();
- }
-
- if (args.clear_active_composition || args.composition) {
+ if (args.composition) {
for (auto &plane : unused_planes) {
if (plane->Get()->AtomicDisablePlane(*pset) != 0) {
return -EINVAL;
@@ -176,7 +166,8 @@
pipe_->connector->Get()->GetName().c_str());
// Disable the hw used by the last active composition. This allows us to
// signal the release fences from that composition to avoid hanging.
- AtomicCommitArgs cl_args = {.clear_active_composition = true};
+ AtomicCommitArgs cl_args{};
+ cl_args.composition = std::make_shared<DrmKmsPlan>();
if (CommitFrame(cl_args)) {
ALOGE("Failed to clean-up active composition for pipeline %s",
pipe_->connector->Get()->GetName().c_str());