From 16e9810d6169f766978c55138f99a7a9cd331ade Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 6 Nov 2019 11:04:21 +0200 Subject: extframebuffer: add missing include --- kms++/inc/kms++/extframebuffer.h | 1 + 1 file changed, 1 insertion(+) (limited to 'kms++/inc') diff --git a/kms++/inc/kms++/extframebuffer.h b/kms++/inc/kms++/extframebuffer.h index 5f0660c..43617eb 100644 --- a/kms++/inc/kms++/extframebuffer.h +++ b/kms++/inc/kms++/extframebuffer.h @@ -2,6 +2,7 @@ #include "framebuffer.h" #include "pixelformats.h" +#include namespace kms { -- cgit v1.2.3 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 + 4 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 kms++/inc/kms++/dmabufframebuffer.h (limited to 'kms++/inc') 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" -- 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++/inc/kms++/dmabufframebuffer.h | 5 +++++ kms++/inc/kms++/framebuffer.h | 10 ++++++++++ 2 files changed, 15 insertions(+) (limited to 'kms++/inc') diff --git a/kms++/inc/kms++/dmabufframebuffer.h b/kms++/inc/kms++/dmabufframebuffer.h index 494aa97..95460cb 100644 --- a/kms++/inc/kms++/dmabufframebuffer.h +++ b/kms++/inc/kms++/dmabufframebuffer.h @@ -27,6 +27,9 @@ public: uint8_t* map(unsigned plane); int prime_fd(unsigned plane); + void begin_cpu_access(CpuAccess access); + void end_cpu_access(); + private: struct FramebufferPlane { uint32_t handle; @@ -41,6 +44,8 @@ private: struct FramebufferPlane m_planes[4]; PixelFormat m_format; + + uint32_t m_sync_flags = 0; }; } diff --git a/kms++/inc/kms++/framebuffer.h b/kms++/inc/kms++/framebuffer.h index 3d43d08..6f90541 100644 --- a/kms++/inc/kms++/framebuffer.h +++ b/kms++/inc/kms++/framebuffer.h @@ -5,6 +5,13 @@ namespace kms { +enum class CpuAccess +{ + Read, + Write, + ReadWrite, +}; + class IFramebuffer { public: virtual ~IFramebuffer() { } @@ -20,6 +27,9 @@ public: virtual uint32_t offset(unsigned plane) const { throw std::runtime_error("not implemented"); } virtual uint8_t* map(unsigned plane) { throw std::runtime_error("not implemented"); } virtual int prime_fd(unsigned plane) { throw std::runtime_error("not implemented"); } + + virtual void begin_cpu_access(CpuAccess access) { } + virtual void end_cpu_access() { } }; class Framebuffer : public DrmObject, public IFramebuffer -- 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++/inc/kms++/dumbframebuffer.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'kms++/inc') diff --git a/kms++/inc/kms++/dumbframebuffer.h b/kms++/inc/kms++/dumbframebuffer.h index fb99d0e..9051c03 100644 --- a/kms++/inc/kms++/dumbframebuffer.h +++ b/kms++/inc/kms++/dumbframebuffer.h @@ -36,9 +36,6 @@ private: uint8_t *map; }; - void Create(); - void Destroy(); - unsigned m_num_planes; struct FramebufferPlane m_planes[4]; -- 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++/inc/kms++/card.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kms++/inc') diff --git a/kms++/inc/kms++/card.h b/kms++/inc/kms++/card.h index e734689..e561ffc 100644 --- a/kms++/inc/kms++/card.h +++ b/kms++/inc/kms++/card.h @@ -50,13 +50,13 @@ public: bool has_dumb_buffers() const { return m_has_dumb; } bool has_kms() const; - const std::vector get_connectors() const { return m_connectors; } - const std::vector get_encoders() const { return m_encoders; } - const std::vector get_crtcs() const { return m_crtcs; } - const std::vector get_planes() const { return m_planes; } - const std::vector get_properties() const { return m_properties; } + std::vector get_connectors() const { return m_connectors; } + std::vector get_encoders() const { return m_encoders; } + std::vector get_crtcs() const { return m_crtcs; } + std::vector get_planes() const { return m_planes; } + std::vector get_properties() const { return m_properties; } - const std::vector get_objects() const; + std::vector get_objects() const; std::vector get_connected_pipelines(); -- cgit v1.2.3 From c6984ae0666c06a7bee8812627069ae3c197ea9e Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 6 Nov 2019 15:43:19 +0200 Subject: kms++: use 'override' all around --- kms++/inc/kms++/blob.h | 2 +- kms++/inc/kms++/connector.h | 4 ++-- kms++/inc/kms++/crtc.h | 4 ++-- kms++/inc/kms++/dmabufframebuffer.h | 26 +++++++++++++------------- kms++/inc/kms++/drmpropobject.h | 2 +- kms++/inc/kms++/dumbframebuffer.h | 20 ++++++++++---------- kms++/inc/kms++/encoder.h | 2 +- kms++/inc/kms++/extframebuffer.h | 16 ++++++++-------- kms++/inc/kms++/framebuffer.h | 6 +++--- kms++/inc/kms++/plane.h | 2 +- kms++/inc/kms++/property.h | 2 +- 11 files changed, 43 insertions(+), 43 deletions(-) (limited to 'kms++/inc') diff --git a/kms++/inc/kms++/blob.h b/kms++/inc/kms++/blob.h index fd872f1..31e915c 100644 --- a/kms++/inc/kms++/blob.h +++ b/kms++/inc/kms++/blob.h @@ -11,7 +11,7 @@ class Blob : public DrmObject public: Blob(Card& card, uint32_t blob_id); Blob(Card& card, void* data, size_t len); - virtual ~Blob(); + ~Blob() override; std::vector data(); diff --git a/kms++/inc/kms++/connector.h b/kms++/inc/kms++/connector.h index 155f916..323d37d 100644 --- a/kms++/inc/kms++/connector.h +++ b/kms++/inc/kms++/connector.h @@ -46,9 +46,9 @@ public: std::vector get_encoders() const; private: Connector(Card& card, uint32_t id, uint32_t idx); - ~Connector(); + ~Connector() override; - void setup(); + void setup() override; void restore_mode(); ConnectorPriv* m_priv; diff --git a/kms++/inc/kms++/crtc.h b/kms++/inc/kms++/crtc.h index ea20ef8..990fc20 100644 --- a/kms++/inc/kms++/crtc.h +++ b/kms++/inc/kms++/crtc.h @@ -42,9 +42,9 @@ public: int gamma_size() const; private: Crtc(Card& card, uint32_t id, uint32_t idx); - ~Crtc(); + ~Crtc() override; - void setup(); + void setup() override; void restore_mode(Connector *conn); CrtcPriv* m_priv; diff --git a/kms++/inc/kms++/dmabufframebuffer.h b/kms++/inc/kms++/dmabufframebuffer.h index 95460cb..73c6d21 100644 --- a/kms++/inc/kms++/dmabufframebuffer.h +++ b/kms++/inc/kms++/dmabufframebuffer.h @@ -12,23 +12,23 @@ 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(); + ~DmabufFramebuffer() override; - uint32_t width() const { return Framebuffer::width(); } - uint32_t height() const { return Framebuffer::height(); } + uint32_t width() const override { return Framebuffer::width(); } + uint32_t height() const override { return Framebuffer::height(); } - PixelFormat format() const { return m_format; } - unsigned num_planes() const { return m_num_planes; } + PixelFormat format() const override { return m_format; } + unsigned num_planes() const override { 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); - - void begin_cpu_access(CpuAccess access); - void end_cpu_access(); + uint32_t stride(unsigned plane) const override { return m_planes[plane].stride; } + uint32_t size(unsigned plane) const override { return m_planes[plane].size; } + uint32_t offset(unsigned plane) const override { return m_planes[plane].offset; } + uint8_t* map(unsigned plane) override; + int prime_fd(unsigned plane) override; + + void begin_cpu_access(CpuAccess access) override; + void end_cpu_access() override; private: struct FramebufferPlane { diff --git a/kms++/inc/kms++/drmpropobject.h b/kms++/inc/kms++/drmpropobject.h index d9ba58e..809caf5 100644 --- a/kms++/inc/kms++/drmpropobject.h +++ b/kms++/inc/kms++/drmpropobject.h @@ -31,7 +31,7 @@ protected: DrmPropObject(Card& card, uint32_t object_type); DrmPropObject(Card& card, uint32_t id, uint32_t object_type, uint32_t idx = 0); - virtual ~DrmPropObject(); + ~DrmPropObject() override; private: std::map m_prop_values; diff --git a/kms++/inc/kms++/dumbframebuffer.h b/kms++/inc/kms++/dumbframebuffer.h index 9051c03..b722615 100644 --- a/kms++/inc/kms++/dumbframebuffer.h +++ b/kms++/inc/kms++/dumbframebuffer.h @@ -11,20 +11,20 @@ class DumbFramebuffer : public Framebuffer public: DumbFramebuffer(Card& card, uint32_t width, uint32_t height, const std::string& fourcc); DumbFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format); - virtual ~DumbFramebuffer(); + ~DumbFramebuffer() override; - uint32_t width() const { return Framebuffer::width(); } - uint32_t height() const { return Framebuffer::height(); } + uint32_t width() const override { return Framebuffer::width(); } + uint32_t height() const override { return Framebuffer::height(); } - PixelFormat format() const { return m_format; } - unsigned num_planes() const { return m_num_planes; } + PixelFormat format() const override { return m_format; } + unsigned num_planes() const override { 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); + uint32_t stride(unsigned plane) const override { return m_planes[plane].stride; } + uint32_t size(unsigned plane) const override { return m_planes[plane].size; } + uint32_t offset(unsigned plane) const override { return m_planes[plane].offset; } + uint8_t* map(unsigned plane) override; + int prime_fd(unsigned plane) override; private: struct FramebufferPlane { diff --git a/kms++/inc/kms++/encoder.h b/kms++/inc/kms++/encoder.h index 1d36adc..72c0213 100644 --- a/kms++/inc/kms++/encoder.h +++ b/kms++/inc/kms++/encoder.h @@ -20,7 +20,7 @@ public: const std::string& get_encoder_type() const; private: Encoder(Card& card, uint32_t id, uint32_t idx); - ~Encoder(); + ~Encoder() override; EncoderPriv* m_priv; }; diff --git a/kms++/inc/kms++/extframebuffer.h b/kms++/inc/kms++/extframebuffer.h index f764c50..0b9d08a 100644 --- a/kms++/inc/kms++/extframebuffer.h +++ b/kms++/inc/kms++/extframebuffer.h @@ -12,18 +12,18 @@ 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); - virtual ~ExtFramebuffer(); + ~ExtFramebuffer() override; - uint32_t width() const { return Framebuffer::width(); } - uint32_t height() const { return Framebuffer::height(); } + uint32_t width() const override { return Framebuffer::width(); } + uint32_t height() const override { return Framebuffer::height(); } - PixelFormat format() const { return m_format; } - unsigned num_planes() const { return m_num_planes; } + PixelFormat format() const override { return m_format; } + unsigned num_planes() const override { 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; } + uint32_t stride(unsigned plane) const override { return m_planes[plane].stride; } + uint32_t size(unsigned plane) const override { return m_planes[plane].size; } + uint32_t offset(unsigned plane) const override { return m_planes[plane].offset; } private: struct FramebufferPlane { diff --git a/kms++/inc/kms++/framebuffer.h b/kms++/inc/kms++/framebuffer.h index 6f90541..bcfd1f0 100644 --- a/kms++/inc/kms++/framebuffer.h +++ b/kms++/inc/kms++/framebuffer.h @@ -36,10 +36,10 @@ class Framebuffer : public DrmObject, public IFramebuffer { public: Framebuffer(Card& card, uint32_t id); - virtual ~Framebuffer(); + ~Framebuffer() override; - uint32_t width() const { return m_width; } - uint32_t height() const { return m_height; } + uint32_t width() const override { return m_width; } + uint32_t height() const override { return m_height; } void flush(); protected: diff --git a/kms++/inc/kms++/plane.h b/kms++/inc/kms++/plane.h index 27e819b..1d78537 100644 --- a/kms++/inc/kms++/plane.h +++ b/kms++/inc/kms++/plane.h @@ -35,7 +35,7 @@ public: uint32_t gamma_size() const; private: Plane(Card& card, uint32_t id, uint32_t idx); - ~Plane(); + ~Plane() override; PlanePriv* m_priv; }; diff --git a/kms++/inc/kms++/property.h b/kms++/inc/kms++/property.h index b9097ff..8d6088e 100644 --- a/kms++/inc/kms++/property.h +++ b/kms++/inc/kms++/property.h @@ -34,7 +34,7 @@ public: std::vector get_blob_ids() const; private: Property(Card& card, uint32_t id); - ~Property(); + ~Property() override; PropertyType m_type; -- cgit v1.2.3