From 37a76a53ddf8c740b479f773d7d10ad7ca074d83 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 6 Nov 2019 11:29:32 +0200 Subject: Split dmabuf support from ExtFramebuffer into DmabufFramebuffer Signed-off-by: Tomi Valkeinen --- kms++/inc/kms++/decls.h | 1 + kms++/inc/kms++/dmabufframebuffer.h | 46 +++++++++++++++++++++ kms++/inc/kms++/extframebuffer.h | 5 --- kms++/inc/kms++/kms++.h | 1 + kms++/src/dmabufframebuffer.cpp | 81 +++++++++++++++++++++++++++++++++++++ kms++/src/extframebuffer.cpp | 66 ------------------------------ 6 files changed, 129 insertions(+), 71 deletions(-) create mode 100644 kms++/inc/kms++/dmabufframebuffer.h create mode 100644 kms++/src/dmabufframebuffer.cpp (limited to 'kms++') diff --git a/kms++/inc/kms++/decls.h b/kms++/inc/kms++/decls.h index 91bce13..438dad5 100644 --- a/kms++/inc/kms++/decls.h +++ b/kms++/inc/kms++/decls.h @@ -12,6 +12,7 @@ class DrmPropObject; class DumbFramebuffer; class Encoder; class ExtFramebuffer; +class DmabufFramebuffer; class Framebuffer; class PageFlipHandlerBase; class Plane; diff --git a/kms++/inc/kms++/dmabufframebuffer.h b/kms++/inc/kms++/dmabufframebuffer.h new file mode 100644 index 0000000..494aa97 --- /dev/null +++ b/kms++/inc/kms++/dmabufframebuffer.h @@ -0,0 +1,46 @@ +#pragma once + +#include "framebuffer.h" +#include "pixelformats.h" +#include + +namespace kms +{ + +class DmabufFramebuffer : public Framebuffer +{ +public: + DmabufFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, + std::vector fds, std::vector pitches, std::vector offsets); + virtual ~DmabufFramebuffer(); + + uint32_t width() const { return Framebuffer::width(); } + uint32_t height() const { return Framebuffer::height(); } + + PixelFormat format() const { return m_format; } + unsigned num_planes() const { return m_num_planes; } + + uint32_t handle(unsigned plane) const { return m_planes[plane].handle; } + uint32_t stride(unsigned plane) const { return m_planes[plane].stride; } + uint32_t size(unsigned plane) const { return m_planes[plane].size; } + uint32_t offset(unsigned plane) const { return m_planes[plane].offset; } + uint8_t* map(unsigned plane); + int prime_fd(unsigned plane); + +private: + struct FramebufferPlane { + uint32_t handle; + int prime_fd; + uint32_t size; + uint32_t stride; + uint32_t offset; + uint8_t *map; + }; + + unsigned m_num_planes; + struct FramebufferPlane m_planes[4]; + + PixelFormat m_format; +}; + +} diff --git a/kms++/inc/kms++/extframebuffer.h b/kms++/inc/kms++/extframebuffer.h index 43617eb..f764c50 100644 --- a/kms++/inc/kms++/extframebuffer.h +++ b/kms++/inc/kms++/extframebuffer.h @@ -12,8 +12,6 @@ class ExtFramebuffer : public Framebuffer public: ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, std::vector handles, std::vector pitches, std::vector offsets); - ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, - std::vector fds, std::vector pitches, std::vector offsets); virtual ~ExtFramebuffer(); uint32_t width() const { return Framebuffer::width(); } @@ -26,13 +24,10 @@ public: uint32_t stride(unsigned plane) const { return m_planes[plane].stride; } uint32_t size(unsigned plane) const { return m_planes[plane].size; } uint32_t offset(unsigned plane) const { return m_planes[plane].offset; } - uint8_t* map(unsigned plane); - int prime_fd(unsigned plane); private: struct FramebufferPlane { uint32_t handle; - int prime_fd; uint32_t size; uint32_t stride; uint32_t offset; diff --git a/kms++/inc/kms++/kms++.h b/kms++/inc/kms++/kms++.h index 3365ef7..a97505a 100644 --- a/kms++/inc/kms++/kms++.h +++ b/kms++/inc/kms++/kms++.h @@ -8,6 +8,7 @@ #include "framebuffer.h" #include "dumbframebuffer.h" #include "extframebuffer.h" +#include "dmabufframebuffer.h" #include "plane.h" #include "property.h" #include "blob.h" diff --git a/kms++/src/dmabufframebuffer.cpp b/kms++/src/dmabufframebuffer.cpp new file mode 100644 index 0000000..cdf7a74 --- /dev/null +++ b/kms++/src/dmabufframebuffer.cpp @@ -0,0 +1,81 @@ + +#include +#include + +#include +#include +#include +#include + +#include + +using namespace std; + +namespace kms +{ + +DmabufFramebuffer::DmabufFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, + vector fds, vector pitches, vector offsets) + : Framebuffer(card, width, height) +{ + int r; + + m_format = format; + + const PixelFormatInfo& format_info = get_pixel_format_info(format); + + m_num_planes = format_info.num_planes; + + for (int i = 0; i < format_info.num_planes; ++i) { + FramebufferPlane& plane = m_planes[i]; + + plane.prime_fd = fds[i]; + + r = drmPrimeFDToHandle(card.fd(), fds[i], &plane.handle); + if (r) + throw invalid_argument(string("drmPrimeFDToHandle: ") + strerror(errno)); + + plane.stride = pitches[i]; + plane.offset = offsets[i]; + plane.size = plane.stride * height; + plane.map = 0; + } + + uint32_t id; + uint32_t bo_handles[4] = { m_planes[0].handle, m_planes[1].handle, m_planes[2].handle, m_planes[3].handle }; + r = drmModeAddFB2(card.fd(), width, height, (uint32_t)format, + bo_handles, pitches.data(), offsets.data(), &id, 0); + if (r) + throw invalid_argument(string("drmModeAddFB2 failed: ") + strerror(errno)); + + set_id(id); +} + +DmabufFramebuffer::~DmabufFramebuffer() +{ + drmModeRmFB(card().fd(), id()); +} + +uint8_t* DmabufFramebuffer::map(unsigned plane) +{ + FramebufferPlane& p = m_planes[plane]; + + if (p.map) + return p.map; + + p.map = (uint8_t *)mmap(0, p.size, PROT_READ | PROT_WRITE, MAP_SHARED, + p.prime_fd, 0); + if (p.map == MAP_FAILED) + throw invalid_argument(string("mmap failed: ") + strerror(errno)); + + return p.map; +} + +int DmabufFramebuffer::prime_fd(unsigned plane) +{ + FramebufferPlane& p = m_planes[plane]; + + return p.prime_fd; +} + +} diff --git a/kms++/src/extframebuffer.cpp b/kms++/src/extframebuffer.cpp index 12e59b7..28cc138 100644 --- a/kms++/src/extframebuffer.cpp +++ b/kms++/src/extframebuffer.cpp @@ -28,7 +28,6 @@ ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, Pixe FramebufferPlane& plane = m_planes[i]; plane.handle = handles[i]; - plane.prime_fd = 0; plane.stride = pitches[i]; plane.offset = offsets[i]; @@ -44,74 +43,9 @@ ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, Pixe set_id(id); } -ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, - vector fds, vector pitches, vector offsets) - : Framebuffer(card, width, height) -{ - int r; - - m_format = format; - - const PixelFormatInfo& format_info = get_pixel_format_info(format); - - m_num_planes = format_info.num_planes; - - for (int i = 0; i < format_info.num_planes; ++i) { - FramebufferPlane& plane = m_planes[i]; - - plane.prime_fd = fds[i]; - - r = drmPrimeFDToHandle(card.fd(), fds[i], &plane.handle); - if (r) - throw invalid_argument(string("drmPrimeFDToHandle: ") + strerror(errno)); - - plane.stride = pitches[i]; - plane.offset = offsets[i]; - plane.size = plane.stride * height; - plane.map = 0; - } - - uint32_t id; - uint32_t bo_handles[4] = { m_planes[0].handle, m_planes[1].handle }; - r = drmModeAddFB2(card.fd(), width, height, (uint32_t)format, - bo_handles, pitches.data(), offsets.data(), &id, 0); - if (r) - throw invalid_argument(string("drmModeAddFB2 failed: ") + strerror(errno)); - - set_id(id); -} - ExtFramebuffer::~ExtFramebuffer() { drmModeRmFB(card().fd(), id()); } -uint8_t* ExtFramebuffer::map(unsigned plane) -{ - FramebufferPlane& p = m_planes[plane]; - - if (!p.prime_fd) - throw invalid_argument("cannot mmap non-dmabuf fb"); - - if (p.map) - return p.map; - - p.map = (uint8_t *)mmap(0, p.size, PROT_READ | PROT_WRITE, MAP_SHARED, - p.prime_fd, 0); - if (p.map == MAP_FAILED) - throw invalid_argument(string("mmap failed: ") + strerror(errno)); - - return p.map; -} - -int ExtFramebuffer::prime_fd(unsigned plane) -{ - FramebufferPlane& p = m_planes[plane]; - - if (!p.prime_fd) - throw invalid_argument("no primefb for non-dmabuf fb"); - - return p.prime_fd; -} - } -- cgit v1.2.3