Fix exception string.

[android/external-libkmsxx.git] / libkms++ / card.cpp

diff --git a/libkms++/card.cpp b/libkms++/card.cpp
index 626c424be365610c07119489e5b6f7a1726ccf61..3a0f2701d8e5ba2138646041cbafa30094e2be44 100644 (file)
--- a/libkms++/card.cpp
+++ b/libkms++/card.cpp
@@ -26,8 +26,8 @@ Card::Card()
 
        int fd = open(card, O_RDWR | O_CLOEXEC);
        if (fd < 0)
-               throw invalid_argument((string(strerror(errno)) +
-                                       " opening " + card).c_str());
+               throw invalid_argument(string(strerror(errno)) + " opening " +
+                                      card);
        m_fd = fd;
 
        int r;
@@ -35,12 +35,19 @@ Card::Card()
        r = drmSetMaster(fd);
        m_master = r == 0;
 
-       r = drmSetClientCap(m_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
-       if (r)
-               throw invalid_argument("Can't set universal planes");
+       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;
+       }
 
-       r = drmSetClientCap(m_fd, DRM_CLIENT_CAP_ATOMIC, 1);
-       m_has_atomic = r == 0;
+       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;
+       }
 
        uint64_t has_dumb;
        r = drmGetCap(fd, DRM_CAP_DUMB_BUFFER, &has_dumb);
@@ -100,12 +107,20 @@ Card::Card()
 
 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) {
@@ -125,18 +140,18 @@ void Card::print_short() const
        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;
        }
 
-       throw invalid_argument("foo");
+       throw invalid_argument(string("Card property ") + name + " not found");
 }
 
 Connector* Card::get_first_connected_connector() const
@@ -193,7 +208,7 @@ Crtc* Card::get_crtc_by_index(uint32_t idx) const
                if (crtc && crtc->idx() == idx)
                        return crtc;
        }
-       throw invalid_argument("fob");
+       throw invalid_argument(string("Crtc #") + to_string(idx) + " not found");
 }
 
 Crtc* Card::get_crtc(uint32_t id) const { return dynamic_cast<Crtc*>(get_object(id)); }
@@ -221,7 +236,9 @@ std::vector<kms::Pipeline> Card::get_connected_pipelines()
                }
 
                if (!crtc)
-                       throw invalid_argument("fob");
+                       throw invalid_argument(string("Connector #") +
+                                              to_string(conn->idx()) +
+                                              " has no possible crtcs");
 
                outputs.push_back(Pipeline { crtc, conn });
        }
@@ -229,4 +246,24 @@ 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);
+}
+
 }