index 5c83ad77758ca7a1e0086484d219c88bdb9d9925..9a8a66bb06798a13b06197b512811985534a75ac 100644 (file)
using namespace kms;
using namespace std;
-template<class C, class T>
-auto contains(const C& v, const T& x)
--> decltype(end(v), true)
-{
- return end(v) != std::find(begin(v), end(v), x);
-}
-
ResourceManager::ResourceManager(Card& card)
: m_card(card)
{
m_reserved_planes.clear();
}
-static Connector* find_connector(Card& card, const vector<Connector*> reserved)
+static Connector* find_connector(Card& card, const set<Connector*> reserved)
{
for (Connector* conn : card.get_connectors()) {
if (!conn->connected())
continue;
- if (contains(reserved, conn))
+ if (reserved.count(conn))
continue;
return conn;
return nullptr;
}
-static Connector* resolve_connector(Card& card, const string& name, const vector<Connector*> reserved)
+static Connector* resolve_connector(Card& card, const string& name, const set<Connector*> reserved)
{
auto connectors = card.get_connectors();
if (*endptr == 0) {
Connector* c = card.get_connector(id);
- if (!c || contains(reserved, c))
+ if (!c || reserved.count(c))
return nullptr;
return c;
Connector* c = connectors[idx];
- if (contains(reserved, c))
+ if (reserved.count(c))
return nullptr;
return c;
if (to_lower(conn->fullname()).find(to_lower(name)) == string::npos)
continue;
- if (contains(reserved, conn))
+ if (reserved.count(conn))
continue;
return conn;
if (!conn)
return nullptr;
- m_reserved_connectors.push_back(conn);
+ m_reserved_connectors.insert(conn);
return conn;
}
Connector* ResourceManager::reserve_connector(Connector* conn)
{
- if (contains(m_reserved_connectors, conn))
+ if (!conn)
+ return nullptr;
+
+ if (m_reserved_connectors.count(conn))
return nullptr;
- m_reserved_connectors.push_back(conn);
+ m_reserved_connectors.insert(conn);
return conn;
}
Crtc* ResourceManager::reserve_crtc(Connector* conn)
{
+ if (!conn)
+ return nullptr;
+
if (Crtc* crtc = conn->get_current_crtc()) {
- m_reserved_crtcs.push_back(crtc);
+ m_reserved_crtcs.insert(crtc);
return crtc;
}
for (Crtc* crtc : conn->get_possible_crtcs()) {
- if (contains(m_reserved_crtcs, crtc))
+ if (m_reserved_crtcs.count(crtc))
continue;
- m_reserved_crtcs.push_back(crtc);
+ m_reserved_crtcs.insert(crtc);
return crtc;
}
return nullptr;
}
+Crtc* ResourceManager::reserve_crtc(Crtc* crtc)
+{
+ if (!crtc)
+ return nullptr;
+
+ if (m_reserved_crtcs.count(crtc))
+ return nullptr;
+
+ m_reserved_crtcs.insert(crtc);
+
+ return crtc;
+}
+
Plane* ResourceManager::reserve_plane(Crtc* crtc, PlaneType type, PixelFormat format)
{
+ if (!crtc)
+ return nullptr;
+
for (Plane* plane : crtc->get_possible_planes()) {
if (plane->plane_type() != type)
continue;
@@ -135,10 +150,45 @@ Plane* ResourceManager::reserve_plane(Crtc* crtc, PlaneType type, PixelFormat fo
if (format != PixelFormat::Undefined && !plane->supports_format(format))
continue;
- if (contains(m_reserved_planes, plane))
+ if (m_reserved_planes.count(plane))
+ continue;
+
+ m_reserved_planes.insert(plane);
+ return plane;
+ }
+
+ return nullptr;
+}
+
+Plane* ResourceManager::reserve_plane(Plane* plane)
+{
+ if (!plane)
+ return nullptr;
+
+ if (m_reserved_planes.count(plane))
+ return nullptr;
+
+ m_reserved_planes.insert(plane);
+
+ return plane;
+}
+
+Plane* ResourceManager::reserve_generic_plane(Crtc* crtc, PixelFormat format)
+{
+ if (!crtc)
+ return nullptr;
+
+ for (Plane* plane : crtc->get_possible_planes()) {
+ if (plane->plane_type() == PlaneType::Cursor)
+ continue;
+
+ if (format != PixelFormat::Undefined && !plane->supports_format(format))
+ continue;
+
+ if (m_reserved_planes.count(plane))
continue;
- m_reserved_planes.push_back(plane);
+ m_reserved_planes.insert(plane);
return plane;
}