drm_hwcomposer: Handle unused planes by DrmDisplayCompositor
Rationale:
1. Cleanup/Simplify DrmDisplayComposition class
2. Prepare for shared planes support
Signed-off-by: Roman Stratiienko <roman.o.stratiienko@globallogic.com>
Tested-by: Martin Juecker <martin.juecker@gmail.com>
Reviewed-by: Matvii Zorin <matvii.zorin@globallogic.com>
diff --git a/compositor/Planner.cpp b/compositor/Planner.cpp
index 9db03c3..fd9678c 100644
--- a/compositor/Planner.cpp
+++ b/compositor/Planner.cpp
@@ -70,8 +70,7 @@
int PlanStageProtected::ProvisionPlanes(
std::vector<DrmCompositionPlane> *composition,
- std::map<size_t, DrmHwcLayer *> &layers,
- std::vector<DrmPlane *> *planes) {
+ std::map<size_t, DrmHwcLayer *> &layers, std::vector<DrmPlane *> *planes) {
int ret = 0;
for (auto i = layers.begin(); i != layers.end();) {
if (!i->second->protected_usage()) {
@@ -79,8 +78,7 @@
continue;
}
- ret = Emplace(composition, planes, DrmCompositionPlane::Type::kLayer,
- std::make_pair(i->first, i->second));
+ ret = Emplace(composition, planes, std::make_pair(i->first, i->second));
if (ret) {
ALOGE("Failed to dedicate protected layer! Dropping it.");
return ret;
@@ -94,12 +92,10 @@
int PlanStageGreedy::ProvisionPlanes(
std::vector<DrmCompositionPlane> *composition,
- std::map<size_t, DrmHwcLayer *> &layers,
- std::vector<DrmPlane *> *planes) {
+ std::map<size_t, DrmHwcLayer *> &layers, std::vector<DrmPlane *> *planes) {
// Fill up the remaining planes
for (auto i = layers.begin(); i != layers.end(); i = layers.erase(i)) {
- int ret = Emplace(composition, planes, DrmCompositionPlane::Type::kLayer,
- std::make_pair(i->first, i->second));
+ int ret = Emplace(composition, planes, std::make_pair(i->first, i->second));
// We don't have any planes left
if (ret == -ENOENT)
break;