From a9480f87902840388497ff85062e73381317626f Mon Sep 17 00:00:00 2001 From: Matt Hoosier Date: Wed, 27 May 2020 15:28:23 -0500 Subject: card: add constructor for pre-opened FD This is an escape hatch to let the user do whatever crazy thing he wants to obtain the DRM fd. This could be from a DRM lease, an FD passed across a Wayland protocol request, something calculated by manually walking across the set of DRI cards and selecting specific criteria, etc. --- kms++/inc/kms++/card.h | 1 + kms++/src/card.cpp | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/kms++/inc/kms++/card.h b/kms++/inc/kms++/card.h index e561ffc..9ca06b2 100644 --- a/kms++/inc/kms++/card.h +++ b/kms++/inc/kms++/card.h @@ -26,6 +26,7 @@ class Card public: Card(const std::string& dev_path = ""); Card(const std::string& driver, uint32_t idx); + Card(int fd, bool take_ownership); virtual ~Card(); Card(const Card& other) = delete; diff --git a/kms++/src/card.cpp b/kms++/src/card.cpp index 5b3d69e..062645a 100644 --- a/kms++/src/card.cpp +++ b/kms++/src/card.cpp @@ -148,6 +148,20 @@ Card::Card(const std::string& driver, uint32_t idx) setup(); } +Card::Card(int fd, bool take_ownership) +{ + if (take_ownership) { + m_fd = fd; + } else { + m_fd = fcntl(fd, F_DUPFD_CLOEXEC, 0); + + if (m_fd < 0) + throw invalid_argument(string(strerror(errno)) + " duplicating fd"); + } + + setup(); +} + void Card::setup() { drmVersionPtr ver = drmGetVersion(m_fd); -- cgit v1.2.3 From 554f3f0231c432dea740e56d6a51a15983c93310 Mon Sep 17 00:00:00 2001 From: Matt Hoosier Date: Wed, 27 May 2020 15:29:00 -0500 Subject: card: add factory function for selecting card by name Uses drmOpen() to do the heavy lifting. --- kms++/inc/kms++/card.h | 2 ++ kms++/src/card.cpp | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/kms++/inc/kms++/card.h b/kms++/inc/kms++/card.h index 9ca06b2..5c1cf7c 100644 --- a/kms++/inc/kms++/card.h +++ b/kms++/inc/kms++/card.h @@ -24,6 +24,8 @@ class Card { friend class Framebuffer; public: + static std::unique_ptr open_named_card(const std::string& name); + Card(const std::string& dev_path = ""); Card(const std::string& driver, uint32_t idx); Card(int fd, bool take_ownership); diff --git a/kms++/src/card.cpp b/kms++/src/card.cpp index 062645a..527aca6 100644 --- a/kms++/src/card.cpp +++ b/kms++/src/card.cpp @@ -104,6 +104,16 @@ static int open_device_by_driver(string name, uint32_t idx) throw invalid_argument("Failed to find a DRM device " + name + ":" + to_string(idx)); } +std::unique_ptr Card::open_named_card(const std::string& name) +{ + int fd = drmOpen(name.c_str(), 0); + + if (fd < 0) + throw invalid_argument(string(strerror(errno)) + " opening card \"" + name + "\""); + + return std::unique_ptr(new Card(fd, true)); +} + Card::Card(const std::string& dev_path) { const char* drv_p = getenv("KMSXX_DRIVER"); -- cgit v1.2.3