summaryrefslogtreecommitdiff
path: root/kms++/src
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2017-02-10 07:03:38 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2017-02-10 10:54:04 +0200
commitaa00f229637653ca07b9c4ec177208893eef4c9d (patch)
treefa0b293bf83e75f4a5e10277477b373b9e7fe3fa /kms++/src
parent16ed78a1725d4c69dd5ff090f050673fb910a4d8 (diff)
improve ExtFb
Inherit MappedFramebuffer and add map()
Diffstat (limited to 'kms++/src')
-rw-r--r--kms++/src/extframebuffer.cpp58
1 files changed, 53 insertions, 5 deletions
diff --git a/kms++/src/extframebuffer.cpp b/kms++/src/extframebuffer.cpp
index 1af2f62..2f23a33 100644
--- a/kms++/src/extframebuffer.cpp
+++ b/kms++/src/extframebuffer.cpp
@@ -14,8 +14,26 @@ namespace kms
ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format,
uint32_t handles[], uint32_t pitches[], uint32_t offsets[])
- : Framebuffer(card, width, height)
+ : MappedFramebuffer(card, width, height)
{
+ 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.handle = handles[i];
+ plane.prime_fd = 0;
+
+ plane.stride = pitches[i];
+ plane.offset = offsets[i];
+ plane.size = plane.stride * height;
+ plane.map = 0;
+ }
+
uint32_t id;
int r = drmModeAddFB2(card.fd(), width, height, (uint32_t)format, handles, pitches, offsets, &id, 0);
if (r)
@@ -26,23 +44,35 @@ ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, Pixe
ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format,
int fds[4], uint32_t pitches[4], uint32_t offsets[4])
- : Framebuffer(card, width, height)
+ : MappedFramebuffer(card, width, height)
{
int r;
+ m_format = format;
+
const PixelFormatInfo& format_info = get_pixel_format_info(format);
- uint32_t handles[4] = { 0 };
+ m_num_planes = format_info.num_planes;
for (int i = 0; i < format_info.num_planes; ++i) {
- r = drmPrimeFDToHandle(card.fd(), fds[i], &handles[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,
- handles, pitches, offsets, &id, 0);
+ bo_handles, pitches, offsets, &id, 0);
if (r)
throw invalid_argument(string("drmModeAddFB2 failed: ") + strerror(errno));
@@ -54,4 +84,22 @@ 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;
+}
+
}