diff --git a/libkms++/card.cpp b/libkms++/card.cpp
index ae41f1070f59bbddd31a4b29c1b7c3ccfa3c1d89..a0e395eb19acf40eb5ff8f76073d37444cfdd8b2 100644 (file)
--- a/libkms++/card.cpp
+++ b/libkms++/card.cpp
#include "kms++.h"
-#ifndef DRM_CLIENT_CAP_ATOMIC
-#define DRM_CLIENT_CAP_ATOMIC 3
-#endif
-
using namespace std;
namespace kms
m_has_universal_planes = false;
}
+#ifdef DRM_CLIENT_CAP_ATOMIC
if (getenv("LIBKMSXX_DISABLE_ATOMIC") == 0) {
r = drmSetClientCap(m_fd, DRM_CLIENT_CAP_ATOMIC, 1);
m_has_atomic = r == 0;
} else {
m_has_atomic = false;
}
+#else
+ m_has_atomic = false;
+#endif
uint64_t has_dumb;
r = drmGetCap(fd, DRM_CAP_DUMB_BUFFER, &has_dumb);
for (int i = 0; i < res->count_connectors; ++i) {
uint32_t id = res->connectors[i];
- m_obmap[id] = new Connector(*this, id, i);
+ auto ob = new Connector(*this, id, i);
+ m_obmap[id] = ob;
+ m_connectors.push_back(ob);
}
for (int i = 0; i < res->count_crtcs; ++i) {
uint32_t id = res->crtcs[i];
- m_obmap[id] = new Crtc(*this, id, i);
+ auto ob = new Crtc(*this, id, i);
+ m_obmap[id] = ob;
+ m_crtcs.push_back(ob);
}
for (int i = 0; i < res->count_encoders; ++i) {
uint32_t id = res->encoders[i];
- m_obmap[id] = new Encoder(*this, id);
+ auto ob = new Encoder(*this, id);
+ m_obmap[id] = ob;
+ m_encoders.push_back(ob);
}
drmModeFreeResources(res);
for (uint i = 0; i < planeRes->count_planes; ++i) {
uint32_t id = planeRes->planes[i];
- m_obmap[id] = new Plane(*this, id);
+ auto ob = new Plane(*this, id);
+ m_obmap[id] = ob;
+ m_planes.push_back(ob);
}
drmModeFreePlaneResources(planeRes);
for (unsigned i = 0; i < props->count_props; ++i) {
uint32_t prop_id = props->props[i];
- if (m_obmap.find(prop_id) == m_obmap.end())
- m_obmap[prop_id] = new Property(*this, prop_id);
+ if (m_obmap.find(prop_id) == m_obmap.end()) {
+ auto ob = new Property(*this, prop_id);
+ m_obmap[prop_id] = ob;
+ m_properties.push_back(ob);
+ }
}
drmModeFreeObjectProperties(props);
conn->restore_mode();
}
-template <class T> static void print_obs(const map<uint32_t, DrmObject*>& obmap)
-{
- for (auto pair : obmap) {
- auto ob = pair.second;
- if (dynamic_cast<T*>(ob)) {
- ob->print_short();
- //ob->print_props();
- }
- }
-}
-
-void Card::print_short() const
-{
- print_obs<Connector>(m_obmap);
- print_obs<Encoder>(m_obmap);
- print_obs<Crtc>(m_obmap);
- print_obs<Plane>(m_obmap);
-}
-
Property* Card::get_prop(const string& name) const
{
- for (auto pair : m_obmap) {
- auto prop = dynamic_cast<Property*>(pair.second);
- if (!prop)
- continue;
-
+ for (auto prop : m_properties) {
if (name == prop->name())
return prop;
}
Connector* Card::get_first_connected_connector() const
{
- for(auto pair : m_obmap) {
- auto c = dynamic_cast<Connector*>(pair.second);
-
- if (c && c->connected())
+ for(auto c : m_connectors) {
+ if (c->connected())
return c;
}
return m_obmap.at(id);
}
-vector<Connector*> Card::get_connectors() const
-{
- vector<Connector*> v;
- for(auto pair : m_obmap) {
- auto p = dynamic_cast<Connector*>(pair.second);
- if (p)
- v.push_back(p);
- }
- return v;
-}
-
-vector<Plane*> Card::get_planes() const
-{
- vector<Plane*> v;
- for(auto pair : m_obmap) {
- auto p = dynamic_cast<Plane*>(pair.second);
- if (p)
- v.push_back(p);
- }
- return v;
-}
-
-vector<DrmObject*> Card::get_objects() const
+const vector<DrmObject*> Card::get_objects() const
{
vector<DrmObject*> v;
for(auto pair : m_obmap)
Crtc* Card::get_crtc_by_index(uint32_t idx) const
{
- for(auto pair : m_obmap) {
- auto crtc = dynamic_cast<Crtc*>(pair.second);
- if (crtc && crtc->idx() == idx)
- return crtc;
- }
- throw invalid_argument(string("Crtc #") + to_string(idx) + "not found");
+ return m_crtcs[idx];
}
+Connector* Card::get_connector(uint32_t id) const { return dynamic_cast<Connector*>(get_object(id)); }
Crtc* Card::get_crtc(uint32_t id) const { return dynamic_cast<Crtc*>(get_object(id)); }
Encoder* Card::get_encoder(uint32_t id) const { return dynamic_cast<Encoder*>(get_object(id)); }
Property* Card::get_prop(uint32_t id) const { return dynamic_cast<Property*>(get_object(id)); }
+Plane* Card::get_plane(uint32_t id) const { return dynamic_cast<Plane*>(get_object(id)); }
std::vector<kms::Pipeline> Card::get_connected_pipelines()
{
return outputs;
}
+static void page_flip_handler(int fd, unsigned int frame,
+ unsigned int sec, unsigned int usec,
+ void *data)
+{
+ auto handler = (PageFlipHandlerBase*)data;
+ double time = sec + usec / 1000000.0;
+ handler->handle_page_flip(frame, time);
+}
+
+void Card::call_page_flip_handlers()
+{
+ drmEventContext ev = {
+ .version = DRM_EVENT_CONTEXT_VERSION,
+ .vblank_handler = 0,
+ .page_flip_handler = page_flip_handler,
+ };
+
+ drmHandleEvent(fd(), &ev);
+}
+
}