diff options
author | Matvii Zorin <matvii.zorin@globallogic.com> | 2021-01-18 15:54:22 +0200 |
---|---|---|
committer | Matvii Zorin <matvii.zorin@globallogic.com> | 2021-04-06 12:46:22 +0300 |
commit | f0757c21ecbc74504747e484b3cb6b480d1d9501 (patch) | |
tree | b5f75e79b8cf3b679ba363395dee2c70c0f12ec4 | |
parent | 9f79c0cd7fe48ff9b1bd4caf9ab5040a17b265ac (diff) | |
download | drm_hwcomposer-f0757c21ecbc74504747e484b3cb6b480d1d9501.tar.gz |
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>
-rw-r--r-- | compositor/DrmDisplayComposition.cpp | 3 | ||||
-rw-r--r-- | compositor/DrmDisplayComposition.h | 16 | ||||
-rw-r--r-- | compositor/DrmDisplayCompositor.cpp | 1 | ||||
-rw-r--r-- | compositor/Planner.cpp | 10 | ||||
-rw-r--r-- | compositor/Planner.h | 9 |
5 files changed, 13 insertions, 26 deletions
diff --git a/compositor/DrmDisplayComposition.cpp b/compositor/DrmDisplayComposition.cpp index 0d1278e..7008e9c 100644 --- a/compositor/DrmDisplayComposition.cpp +++ b/compositor/DrmDisplayComposition.cpp @@ -76,8 +76,7 @@ int DrmDisplayComposition::SetDisplayMode(const DrmMode &display_mode) { } int DrmDisplayComposition::AddPlaneDisable(DrmPlane *plane) { - composition_planes_.emplace_back(DrmCompositionPlane::Type::kDisable, plane, - crtc_); + composition_planes_.emplace_back(DrmCompositionPlane::Type::kDisable, plane); return 0; } diff --git a/compositor/DrmDisplayComposition.h b/compositor/DrmDisplayComposition.h index 6e8b5d2..27b34f2 100644 --- a/compositor/DrmDisplayComposition.h +++ b/compositor/DrmDisplayComposition.h @@ -49,15 +49,10 @@ class DrmCompositionPlane { DrmCompositionPlane() = default; DrmCompositionPlane(DrmCompositionPlane &&rhs) = default; DrmCompositionPlane &operator=(DrmCompositionPlane &&other) = default; - DrmCompositionPlane(Type type, DrmPlane *plane, DrmCrtc *crtc) - : type_(type), plane_(plane), crtc_(crtc) { + DrmCompositionPlane(Type type, DrmPlane *plane) : type_(type), plane_(plane) { } - DrmCompositionPlane(Type type, DrmPlane *plane, DrmCrtc *crtc, - size_t source_layer) - : type_(type), - plane_(plane), - crtc_(crtc), - source_layers_(1, source_layer) { + DrmCompositionPlane(Type type, DrmPlane *plane, size_t source_layer) + : type_(type), plane_(plane), source_layers_(1, source_layer) { } Type type() const { @@ -71,10 +66,6 @@ class DrmCompositionPlane { plane_ = plane; } - DrmCrtc *crtc() const { - return crtc_; - } - std::vector<size_t> &source_layers() { return source_layers_; } @@ -86,7 +77,6 @@ class DrmCompositionPlane { private: Type type_ = Type::kDisable; DrmPlane *plane_ = NULL; - DrmCrtc *crtc_ = NULL; std::vector<size_t> source_layers_; }; diff --git a/compositor/DrmDisplayCompositor.cpp b/compositor/DrmDisplayCompositor.cpp index e063385..665446e 100644 --- a/compositor/DrmDisplayCompositor.cpp +++ b/compositor/DrmDisplayCompositor.cpp @@ -261,7 +261,6 @@ int DrmDisplayCompositor::CommitFrame(DrmDisplayComposition *display_comp, for (DrmCompositionPlane &comp_plane : comp_planes) { DrmPlane *plane = comp_plane.plane(); - DrmCrtc *crtc = comp_plane.crtc(); std::vector<size_t> &source_layers = comp_plane.source_layers(); int fb_id = -1; 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 @@ std::tuple<int, std::vector<DrmCompositionPlane>> Planner::ProvisionPlanes( // 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 @@ std::tuple<int, std::vector<DrmCompositionPlane>> Planner::ProvisionPlanes( 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 @@ int PlanStageProtected::ProvisionPlanes( 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 PlanStageProtected::ProvisionPlanes( 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; diff --git a/compositor/Planner.h b/compositor/Planner.h index 5d448a4..7c1fe80 100644 --- a/compositor/Planner.h +++ b/compositor/Planner.h @@ -40,7 +40,6 @@ class Planner { virtual int ProvisionPlanes(std::vector<DrmCompositionPlane> *composition, std::map<size_t, DrmHwcLayer *> &layers, - DrmCrtc *crtc, std::vector<DrmPlane *> *planes) = 0; protected: @@ -58,7 +57,7 @@ class Planner { // Inserts the given layer:plane in the composition at the back static int Emplace(std::vector<DrmCompositionPlane> *composition, std::vector<DrmPlane *> *planes, - DrmCompositionPlane::Type type, DrmCrtc *crtc, + DrmCompositionPlane::Type type, std::pair<size_t, DrmHwcLayer *> layer) { DrmPlane *plane = PopPlane(planes); std::vector<DrmPlane *> unused_planes; @@ -73,7 +72,7 @@ class Planner { } if (!ret) { - composition->emplace_back(type, plane, crtc, layer.first); + composition->emplace_back(type, plane, layer.first); planes->insert(planes->begin(), unused_planes.begin(), unused_planes.end()); } @@ -118,7 +117,7 @@ class Planner { class PlanStageProtected : public Planner::PlanStage { public: int ProvisionPlanes(std::vector<DrmCompositionPlane> *composition, - std::map<size_t, DrmHwcLayer *> &layers, DrmCrtc *crtc, + std::map<size_t, DrmHwcLayer *> &layers, std::vector<DrmPlane *> *planes); }; @@ -128,7 +127,7 @@ class PlanStageProtected : public Planner::PlanStage { class PlanStageGreedy : public Planner::PlanStage { public: int ProvisionPlanes(std::vector<DrmCompositionPlane> *composition, - std::map<size_t, DrmHwcLayer *> &layers, DrmCrtc *crtc, + std::map<size_t, DrmHwcLayer *> &layers, std::vector<DrmPlane *> *planes); }; } // namespace android |