Split dmabuf support from ExtFramebuffer into DmabufFramebuffer

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

9 files changed, 135 insertions, 77 deletions

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 <vector>
+
+namespace kms
+{
+
+class DmabufFramebuffer : public Framebuffer
+{
+public:
+	DmabufFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format,
+			  std::vector<int> fds, std::vector<uint32_t> pitches, std::vector<uint32_t> 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<uint32_t> handles, std::vector<uint32_t> pitches, std::vector<uint32_t> offsets);
-	ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format,
-		       std::vector<int> fds, std::vector<uint32_t> pitches, std::vector<uint32_t> 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 <cstring>
+#include <cerrno>
+
+#include <stdexcept>
+#include <sys/mman.h>
+#include <xf86drm.h>
+#include <xf86drmMode.h>
+
+#include <kms++/kms++.h>
+
+using namespace std;
+
+namespace kms
+{
+
+DmabufFramebuffer::DmabufFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format,
+				     vector<int> fds, vector<uint32_t> pitches, vector<uint32_t> 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<int> fds, vector<uint32_t> pitches, vector<uint32_t> 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;
-}
-
 }
diff --git a/py/pykms/pykmsbase.cpp b/py/pykms/pykmsbase.cpp
index b4dc090..5f39faa 100644
--- a/py/pykms/pykmsbase.cpp
+++ b/py/pykms/pykmsbase.cpp
@@ -167,7 +167,7 @@ void init_pykmsbase(py::module &m)
 			.def("offset", &DumbFramebuffer::offset)
 			;
 
-	py::class_<ExtFramebuffer, Framebuffer>(m, "ExtFramebuffer")
+	py::class_<DmabufFramebuffer, Framebuffer>(m, "DmabufFramebuffer")
 			.def(py::init<Card&, uint32_t, uint32_t, PixelFormat, vector<int>, vector<uint32_t>, vector<uint32_t>>(),
 			     py::keep_alive<1, 2>())	// Keep Card alive until this is destructed
 			;
diff --git a/py/tests/test.py b/py/tests/test.py
index 83cf16a..3f9e205 100755
--- a/py/tests/test.py
+++ b/py/tests/test.py
@@ -28,7 +28,7 @@ else:
 	origfb = pykms.DumbFramebuffer(card, mode.hdisplay, mode.vdisplay, "XR24");
 
 if args.dmabuf:
-	fb = pykms.ExtFramebuffer(card, origfb.width, origfb.height, origfb.format,
+        fb = pykms.DmabufFramebuffer(card, origfb.width, origfb.height, origfb.format,
 		[origfb.fd(0)], [origfb.stride(0)], [origfb.offset(0)])
 else:
 	fb = origfb
diff --git a/utils/kmscapture.cpp b/utils/kmscapture.cpp
index 01eac61..f215a65 100644
--- a/utils/kmscapture.cpp
+++ b/utils/kmscapture.cpp
@@ -38,7 +38,7 @@ public:
 	int fd() const { return m_fd; }
 	void start_streaming();
 private:
-	ExtFramebuffer* GetExtFrameBuffer(Card& card, uint32_t i, PixelFormat pixfmt);
+	DmabufFramebuffer* GetDmabufFrameBuffer(Card& card, uint32_t i, PixelFormat pixfmt);
 	int m_fd;	/* camera file descriptor */
 	Crtc* m_crtc;
 	Plane* m_plane;
@@ -68,7 +68,7 @@ static int buffer_export(int v4lfd, enum v4l2_buf_type bt, uint32_t index, int *
 	return 0;
 }
 
-ExtFramebuffer* CameraPipeline::GetExtFrameBuffer(Card& card, uint32_t i, PixelFormat pixfmt)
+DmabufFramebuffer* CameraPipeline::GetDmabufFrameBuffer(Card& card, uint32_t i, PixelFormat pixfmt)
 {
 	int r, dmafd;
 
@@ -82,7 +82,7 @@ ExtFramebuffer* CameraPipeline::GetExtFrameBuffer(Card& card, uint32_t i, PixelF
 	vector<uint32_t> pitches { m_in_width * (format_info.planes[0].bitspp / 8) };
 	vector<uint32_t> offsets { 0 };
 
-	return new ExtFramebuffer(card, m_in_width, m_in_height, pixfmt,
+	return new DmabufFramebuffer(card, m_in_width, m_in_height, pixfmt,
 				  fds, pitches, offsets);
 }
 
@@ -173,7 +173,7 @@ CameraPipeline::CameraPipeline(int cam_fd, Card& card, Crtc *crtc, Plane* plane,
 		Framebuffer *fb;
 
 		if (m_buffer_provider == BufferProvider::V4L2)
-			fb = GetExtFrameBuffer(card, i, pixfmt);
+			fb = GetDmabufFrameBuffer(card, i, pixfmt);
 		else
 			fb = new DumbFramebuffer(card, m_in_width,
 						 m_in_height, pixfmt);