diff --git a/libkms++/card.cpp b/libkms++/card.cpp
index d652093b3b109b654373da24e986145cd27fd615..63a068a71953b06590cd2b8f441079054f2eaa07 100644 (file)
--- a/libkms++/card.cpp
+++ b/libkms++/card.cpp
r = drmSetMaster(fd);
m_master = r == 0;
- r = drmSetClientCap(m_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
- m_has_universal_planes = r == 0;
+ if (getenv("LIBKMSXX_DISABLE_UNIVERSAL_PLANES") == 0) {
+ r = drmSetClientCap(m_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
+ m_has_universal_planes = r == 0;
+ } else {
+ m_has_universal_planes = false;
+ }
if (getenv("LIBKMSXX_DISABLE_ATOMIC") == 0) {
r = drmSetClientCap(m_fd, DRM_CLIENT_CAP_ATOMIC, 1);
Card::~Card()
{
+ restore_modes();
+
for (auto pair : m_obmap)
delete pair.second;
close(m_fd);
}
+void Card::restore_modes()
+{
+ for (auto conn : get_connectors())
+ conn->restore_mode();
+}
+
template <class T> static void print_obs(const map<uint32_t, DrmObject*>& obmap)
{
for (auto pair : obmap) {
print_obs<Plane>(m_obmap);
}
-Property* Card::get_prop(const char *name) const
+Property* Card::get_prop(const string& name) const
{
for (auto pair : m_obmap) {
auto prop = dynamic_cast<Property*>(pair.second);
if (!prop)
continue;
- if (strcmp(name, prop->name()) == 0)
+ if (name == prop->name())
return prop;
}
if (crtc && crtc->idx() == idx)
return crtc;
}
- throw invalid_argument(string("Crtc #") + to_string(idx) + "not found");
+ throw invalid_argument(string("Crtc #") + to_string(idx) + " not found");
}
+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)); }
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);
+}
+
}