diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-05-22 15:42:14 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-05-23 09:43:27 +0300 |
| commit | ebfe02d5cd4e04d0df471669190e4feb1e2e493c (patch) | |
| tree | 506ac8ba7214c0476127a6ce6e677f6693a25f3f | |
| parent | 6d13ebbb8b9854713a5597df71a12f8dd9a36c34 (diff) | |
Cleanup AtomicReq::commit
| -rw-r--r-- | libkms++/atomicreq.cpp | 7 | ||||
| -rw-r--r-- | libkms++/atomicreq.h | 1 | ||||
| -rw-r--r-- | py/pykms.cpp | 3 | ||||
| -rw-r--r-- | tests/kmscapture.cpp | 2 |
4 files changed, 2 insertions, 11 deletions
diff --git a/libkms++/atomicreq.cpp b/libkms++/atomicreq.cpp index f2aa322..0e627a8 100644 --- a/libkms++/atomicreq.cpp +++ b/libkms++/atomicreq.cpp @@ -63,13 +63,6 @@ int AtomicReq::test() return drmModeAtomicCommit(m_card.fd(), m_req, flags, 0); } -int AtomicReq::commit() -{ - uint32_t flags = 0; - - return drmModeAtomicCommit(m_card.fd(), m_req, flags, 0); -} - int AtomicReq::commit(void* data) { uint32_t flags = DRM_MODE_PAGE_FLIP_EVENT | DRM_MODE_ATOMIC_NONBLOCK; diff --git a/libkms++/atomicreq.h b/libkms++/atomicreq.h index 7a8f2a4..d9aeb08 100644 --- a/libkms++/atomicreq.h +++ b/libkms++/atomicreq.h @@ -23,7 +23,6 @@ public: void add(DrmObject *ob, const std::string& prop, uint64_t value); int test(); - int commit(); int commit(void* data); int commit_sync(); diff --git a/py/pykms.cpp b/py/pykms.cpp index 7e42e4f..c31d5ce 100644 --- a/py/pykms.cpp +++ b/py/pykms.cpp @@ -127,8 +127,7 @@ PYBIND11_PLUGIN(pykms) { py::keep_alive<1, 2>()) // Keep Card alive until this is destructed .def("add", (void (AtomicReq::*)(DrmObject*, const string&, uint64_t)) &AtomicReq::add) .def("test", &AtomicReq::test) - .def("commit", (int (AtomicReq::*)()) &AtomicReq::commit) - .def("commit", (int (AtomicReq::*)(void*)) &AtomicReq::commit) + .def("commit", &AtomicReq::commit) .def("commit_sync", &AtomicReq::commit_sync) ; diff --git a/tests/kmscapture.cpp b/tests/kmscapture.cpp index ff62678..ee700b7 100644 --- a/tests/kmscapture.cpp +++ b/tests/kmscapture.cpp @@ -427,7 +427,7 @@ int main(int argc, char** argv) r = req.test(); FAIL_IF(r, "Atomic commit failed: %d", r); - req.commit(); + req.commit_sync(); } for (auto cam : cameras) |