commit f0757c21ecbc74504747e484b3cb6b480d1d9501
author Matvii Zorin <matvii.zorin@globallogic.com> Mon Jan 18 15:54:22 2021 +0200
committer Matvii Zorin <matvii.zorin@globallogic.com> Tue Apr 06 12:46:22 2021 +0300
tree b5f75e79b8cf3b679ba363395dee2c70c0f12ec4
parent 9f79c0cd7fe48ff9b1bd4caf9ab5040a17b265ac

drm_hwcomposer: Remove ctrc from DrmCompositionPlane

CRTC is set at CreateComposition function and it matches the current
display.

Signed-off-by: Matvii Zorin <matvii.zorin@globallogic.com>

compositor/Planner.cpp

diff --git a/compositor/Planner.cpp b/compositor/Planner.cpp
index 58db2ea..d87e79f 100644
--- a/compositor/Planner.cpp
+++ b/compositor/Planner.cpp
@@ -109,7 +109,7 @@
 
   // Go through the provisioning stages and provision planes
   for (auto &i : stages_) {
-    int ret = i->ProvisionPlanes(&composition, layers, crtc, &planes);
+    int ret = i->ProvisionPlanes(&composition, layers, &planes);
     if (ret) {
       ALOGE("Failed provision stage with ret %d", ret);
       return std::make_tuple(ret, std::vector<DrmCompositionPlane>());
@@ -121,7 +121,7 @@
 
 int PlanStageProtected::ProvisionPlanes(
     std::vector<DrmCompositionPlane> *composition,
-    std::map<size_t, DrmHwcLayer *> &layers, DrmCrtc *crtc,
+    std::map<size_t, DrmHwcLayer *> &layers,
     std::vector<DrmPlane *> *planes) {
   int ret = 0;
   for (auto i = layers.begin(); i != layers.end();) {
@@ -130,7 +130,7 @@
       continue;
     }
 
-    ret = Emplace(composition, planes, DrmCompositionPlane::Type::kLayer, crtc,
+    ret = Emplace(composition, planes, DrmCompositionPlane::Type::kLayer,
                   std::make_pair(i->first, i->second));
     if (ret) {
       ALOGE("Failed to dedicate protected layer! Dropping it.");
@@ -145,12 +145,12 @@
 
 int PlanStageGreedy::ProvisionPlanes(
     std::vector<DrmCompositionPlane> *composition,
-    std::map<size_t, DrmHwcLayer *> &layers, DrmCrtc *crtc,
+    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,
-                      crtc, std::make_pair(i->first, i->second));
+                      std::make_pair(i->first, i->second));
     // We don't have any planes left
     if (ret == -ENOENT)
       break;