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++/src/dmabufframebuffer.cpp | 81 +++++++++++++++++++++++++++++++++++++++++ kms++/src/extframebuffer.cpp | 66 --------------------------------- 2 files changed, 81 insertions(+), 66 deletions(-) create mode 100644 kms++/src/dmabufframebuffer.cpp (limited to 'kms++/src') 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 From 0281f19937bc31b43276c68aff27af1e291cdd97 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 6 Nov 2019 11:38:37 +0200 Subject: fb: add begin_cpu_access & end_cpu_access --- kms++/src/dmabufframebuffer.cpp | 48 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'kms++/src') diff --git a/kms++/src/dmabufframebuffer.cpp b/kms++/src/dmabufframebuffer.cpp index cdf7a74..00ab94e 100644 --- a/kms++/src/dmabufframebuffer.cpp +++ b/kms++/src/dmabufframebuffer.cpp @@ -4,8 +4,10 @@ #include #include +#include #include #include +#include #include @@ -78,4 +80,50 @@ int DmabufFramebuffer::prime_fd(unsigned plane) return p.prime_fd; } +void DmabufFramebuffer::begin_cpu_access(CpuAccess access) +{ + if (m_sync_flags != 0) + throw runtime_error("begin_cpu sync already started"); + + switch (access) { + case CpuAccess::Read: + m_sync_flags = DMA_BUF_SYNC_READ; + break; + case CpuAccess::Write: + m_sync_flags = DMA_BUF_SYNC_WRITE; + break; + case CpuAccess::ReadWrite: + m_sync_flags = DMA_BUF_SYNC_RW; + break; + } + + dma_buf_sync dbs { + .flags = DMA_BUF_SYNC_START | m_sync_flags + }; + + for (uint32_t p = 0; p < m_num_planes; ++p) { + int r = ioctl(prime_fd(p), DMA_BUF_IOCTL_SYNC, &dbs); + if (r) + throw runtime_error("DMA_BUF_IOCTL_SYNC failed"); + } +} + +void DmabufFramebuffer::end_cpu_access() +{ + if (m_sync_flags == 0) + throw runtime_error("begin_cpu sync not started"); + + dma_buf_sync dbs { + .flags = DMA_BUF_SYNC_END | m_sync_flags + }; + + for (uint32_t p = 0; p < m_num_planes; ++p) { + int r = ioctl(prime_fd(p), DMA_BUF_IOCTL_SYNC, &dbs); + if (r) + throw runtime_error("DMA_BUF_IOCTL_SYNC failed"); + } + + m_sync_flags = 0; +} + } -- cgit v1.2.3 From 04aabd4740d9915a72898d8a1c286e8288ec5983 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 6 Nov 2019 15:13:41 +0200 Subject: dumbfb: cleanup to avoid calls to virtual funcs via constructor --- kms++/src/dumbframebuffer.cpp | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'kms++/src') diff --git a/kms++/src/dumbframebuffer.cpp b/kms++/src/dumbframebuffer.cpp index 4419687..2b74c35 100644 --- a/kms++/src/dumbframebuffer.cpp +++ b/kms++/src/dumbframebuffer.cpp @@ -27,16 +27,6 @@ DumbFramebuffer::DumbFramebuffer(Card &card, uint32_t width, uint32_t height, co DumbFramebuffer::DumbFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format) :Framebuffer(card, width, height), m_format(format) -{ - Create(); -} - -DumbFramebuffer::~DumbFramebuffer() -{ - Destroy(); -} - -void DumbFramebuffer::Create() { int r; @@ -50,10 +40,10 @@ void DumbFramebuffer::Create() /* create dumb buffer */ struct drm_mode_create_dumb creq = drm_mode_create_dumb(); - creq.width = width(); - creq.height = height() / pi.ysub; + creq.width = width; + creq.height = height / pi.ysub; creq.bpp = pi.bitspp; - r = drmIoctl(card().fd(), DRM_IOCTL_MODE_CREATE_DUMB, &creq); + r = drmIoctl(card.fd(), DRM_IOCTL_MODE_CREATE_DUMB, &creq); if (r) throw invalid_argument(string("DRM_IOCTL_MODE_CREATE_DUMB failed: ") + strerror(errno)); @@ -70,7 +60,7 @@ void DumbFramebuffer::Create() uint32_t pitches[4] = { m_planes[0].stride, m_planes[1].stride }; uint32_t offsets[4] = { m_planes[0].offset, m_planes[1].offset }; uint32_t id; - r = drmModeAddFB2(card().fd(), width(), height(), (uint32_t)format(), + r = drmModeAddFB2(card.fd(), width, height, (uint32_t)format, bo_handles, pitches, offsets, &id, 0); if (r) throw invalid_argument(string("drmModeAddFB2 failed: ") + strerror(errno)); @@ -78,7 +68,7 @@ void DumbFramebuffer::Create() set_id(id); } -void DumbFramebuffer::Destroy() +DumbFramebuffer::~DumbFramebuffer() { /* delete framebuffer */ drmModeRmFB(card().fd(), id()); -- cgit v1.2.3 From 4dd5456fb352fad9a81034a067d572f2a1ba4dd8 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 6 Nov 2019 15:31:32 +0200 Subject: card: remove useless consts --- kms++/src/card.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kms++/src') diff --git a/kms++/src/card.cpp b/kms++/src/card.cpp index 1509a98..a35b277 100644 --- a/kms++/src/card.cpp +++ b/kms++/src/card.cpp @@ -296,7 +296,7 @@ DrmObject* Card::get_object(uint32_t id) const return nullptr; } -const vector Card::get_objects() const +std::vector Card::get_objects() const { vector v; for(auto pair : m_obmap) -- cgit v1.2.3 From 3009db77d599c6a397c24ba1a4e84c53299162c0 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 6 Nov 2019 15:51:39 +0200 Subject: kms++: modernize deprecated headers --- kms++/src/card.cpp | 4 ++-- kms++/src/connector.cpp | 2 +- kms++/src/crtc.cpp | 2 +- kms++/src/drmobject.cpp | 2 +- kms++/src/drmpropobject.cpp | 2 +- kms++/src/encoder.cpp | 2 +- kms++/src/plane.cpp | 2 +- kms++/src/videomode.cpp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'kms++/src') diff --git a/kms++/src/card.cpp b/kms++/src/card.cpp index a35b277..5b3d69e 100644 --- a/kms++/src/card.cpp +++ b/kms++/src/card.cpp @@ -1,9 +1,9 @@ -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/kms++/src/connector.cpp b/kms++/src/connector.cpp index a1807da..72f8777 100644 --- a/kms++/src/connector.cpp +++ b/kms++/src/connector.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/kms++/src/crtc.cpp b/kms++/src/crtc.cpp index f94216f..7ffaaff 100644 --- a/kms++/src/crtc.cpp +++ b/kms++/src/crtc.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/kms++/src/drmobject.cpp b/kms++/src/drmobject.cpp index f94fc5d..9c0f5ae 100644 --- a/kms++/src/drmobject.cpp +++ b/kms++/src/drmobject.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/kms++/src/drmpropobject.cpp b/kms++/src/drmpropobject.cpp index f91f913..74f8848 100644 --- a/kms++/src/drmpropobject.cpp +++ b/kms++/src/drmpropobject.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/kms++/src/encoder.cpp b/kms++/src/encoder.cpp index bfb2ea8..30a241a 100644 --- a/kms++/src/encoder.cpp +++ b/kms++/src/encoder.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/kms++/src/plane.cpp b/kms++/src/plane.cpp index f68c8d0..b040884 100644 --- a/kms++/src/plane.cpp +++ b/kms++/src/plane.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/kms++/src/videomode.cpp b/kms++/src/videomode.cpp index 7099898..b53f0c0 100644 --- a/kms++/src/videomode.cpp +++ b/kms++/src/videomode.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include -- cgit v1.2.3