Split dmabuf support from ExtFramebuffer into DmabufFramebuffer

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

4 files changed, 48 insertions, 5 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"