From 76b6ef85cded5e576dca6cd2840aeb0da9512287 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 6 Aug 2020 05:17:59 +0300 Subject: card: Add a method to retrieve the device minor The device minor number is needed to access the debugfs directory corresponding to the device. Make it available to users through a dev_minor() method on the Card object. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- kms++/inc/kms++/card.h | 2 ++ kms++/src/card.cpp | 11 +++++++++++ py/pykms/pykmsbase.cpp | 1 + 3 files changed, 14 insertions(+) diff --git a/kms++/inc/kms++/card.h b/kms++/inc/kms++/card.h index 5c1cf7c..8af0969 100644 --- a/kms++/inc/kms++/card.h +++ b/kms++/inc/kms++/card.h @@ -35,6 +35,7 @@ public: Card& operator=(const Card& other) = delete; int fd() const { return m_fd; } + unsigned int dev_minor() const { return m_minor; } void drop_master(); @@ -84,6 +85,7 @@ private: std::vector m_framebuffers; int m_fd; + unsigned int m_minor; bool m_is_master; bool m_has_atomic; diff --git a/kms++/src/card.cpp b/kms++/src/card.cpp index 527aca6..3a7ab70 100644 --- a/kms++/src/card.cpp +++ b/kms++/src/card.cpp @@ -9,6 +9,10 @@ #include #include +#include +#include +#include + #include #include @@ -183,8 +187,15 @@ void Card::setup() m_version.desc = string(ver->desc, ver->desc_len); drmFreeVersion(ver); + struct stat stats; int r; + r = fstat(m_fd, &stats); + if (r < 0) + throw invalid_argument("Can't stat device (" + string(strerror(errno)) + ")"); + + m_minor = minor(stats.st_dev); + r = drmSetMaster(m_fd); m_is_master = r == 0; diff --git a/py/pykms/pykmsbase.cpp b/py/pykms/pykmsbase.cpp index c039833..fc72d05 100644 --- a/py/pykms/pykmsbase.cpp +++ b/py/pykms/pykmsbase.cpp @@ -24,6 +24,7 @@ void init_pykmsbase(py::module &m) .def(py::init()) .def(py::init()) .def_property_readonly("fd", &Card::fd) + .def_property_readonly("minor", &Card::dev_minor) .def_property_readonly("get_first_connected_connector", &Card::get_first_connected_connector) // XXX pybind11 can't handle vector where T is non-copyable, and complains: -- cgit v1.2.3