X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-terminal%2Fgrdev.h;h=35d6eb2abf1346bc28e6c9e87e55dabe87a5bfb0;hb=37cf8fee46025d704660a9fc1d1349fe7d0b139d;hp=2645b1211313931fda477b6ddc95cbf412e8593c;hpb=650c5444273993f969b9cd7df9add6ab2df0414e;p=elogind.git

diff --git a/src/libsystemd-terminal/grdev.h b/src/libsystemd-terminal/grdev.h
index 2645b1211..35d6eb2ab 100644
--- a/src/libsystemd-terminal/grdev.h
+++ b/src/libsystemd-terminal/grdev.h
@@ -55,6 +55,7 @@
 
 #include <drm_fourcc.h>
 #include <inttypes.h>
+#include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <systemd/sd-bus.h>
@@ -92,9 +93,15 @@ struct grdev_fb {
         uint32_t width;
         uint32_t height;
         uint32_t format;
-        uint64_t age;
         int32_t strides[4];
         void *maps[4];
+
+        union {
+                void *ptr;
+                uint64_t u64;
+        } data;
+
+        void (*free_fn) (void *ptr);
 };
 
 struct grdev_display_target {
@@ -104,20 +111,28 @@ struct grdev_display_target {
         uint32_t height;
         unsigned int rotate;
         unsigned int flip;
-        const grdev_fb *fb;
+        grdev_fb *front;
+        grdev_fb *back;
 };
 
+void grdev_display_set_userdata(grdev_display *display, void *userdata);
+void *grdev_display_get_userdata(grdev_display *display);
+
+const char *grdev_display_get_name(grdev_display *display);
+uint32_t grdev_display_get_width(grdev_display *display);
+uint32_t grdev_display_get_height(grdev_display *display);
+
 bool grdev_display_is_enabled(grdev_display *display);
 void grdev_display_enable(grdev_display *display);
 void grdev_display_disable(grdev_display *display);
 
-const grdev_display_target *grdev_display_next_target(grdev_display *display, const grdev_display_target *prev, uint64_t minage);
-void grdev_display_flip_target(grdev_display *display, const grdev_display_target *target, uint64_t age);
+const grdev_display_target *grdev_display_next_target(grdev_display *display, const grdev_display_target *prev);
+void grdev_display_flip_target(grdev_display *display, const grdev_display_target *target);
 
-#define GRDEV_DISPLAY_FOREACH_TARGET(_display, _t, _minage)                     \
-        for ((_t) = grdev_display_next_target((_display), NULL, (_minage));     \
-             (_t);                                                              \
-             (_t) = grdev_display_next_target((_display), (_t), (_minage)))
+#define GRDEV_DISPLAY_FOREACH_TARGET(_display, _t)                      \
+        for ((_t) = grdev_display_next_target((_display), NULL);        \
+             (_t);                                                      \
+             (_t) = grdev_display_next_target((_display), (_t)))
 
 /*
  * Events
@@ -171,6 +186,10 @@ void grdev_session_disable(grdev_session *session);
 void grdev_session_commit(grdev_session *session);
 void grdev_session_restore(grdev_session *session);
 
+void grdev_session_add_drm(grdev_session *session, struct udev_device *ud);
+void grdev_session_remove_drm(grdev_session *session, struct udev_device *ud);
+void grdev_session_hotplug_drm(grdev_session *session, struct udev_device *ud);
+
 /*
  * Contexts
  */