summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2017-03-27 13:35:36 -0400
committerChris Michael <cp.michael@samsung.com>2017-04-18 07:55:10 -0400
commit9d5c76e0d59588670a5125853c3fe17310bc9d17 (patch)
treede178a3b28b82edc039cae227c6c01cd693bedab /src/lib
parent9e07d37320718bbabd4feb4ff151fcb3cfd9f333 (diff)
ecore-drm2: Add library symlink to merge atomic commit requests
Small commit to symlink to drmModeAtomicMerge function so we can use that for atomic commit tests. @feature Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ecore_drm2/ecore_drm2.c2
-rw-r--r--src/lib/ecore_drm2/ecore_drm2_private.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/ecore_drm2/ecore_drm2.c b/src/lib/ecore_drm2/ecore_drm2.c
index 7eec270..48d2d2f 100644
--- a/src/lib/ecore_drm2/ecore_drm2.c
+++ b/src/lib/ecore_drm2/ecore_drm2.c
@@ -23,6 +23,7 @@ void (*sym_drmModeAtomicFree)(drmModeAtomicReqPtr req) = NULL;
23int (*sym_drmModeAtomicAddProperty)(drmModeAtomicReqPtr req, uint32_t object_id, uint32_t property_id, uint64_t value) = NULL; 23int (*sym_drmModeAtomicAddProperty)(drmModeAtomicReqPtr req, uint32_t object_id, uint32_t property_id, uint64_t value) = NULL;
24int (*sym_drmModeAtomicCommit)(int fd, drmModeAtomicReqPtr req, uint32_t flags, void *user_data) = NULL; 24int (*sym_drmModeAtomicCommit)(int fd, drmModeAtomicReqPtr req, uint32_t flags, void *user_data) = NULL;
25void (*sym_drmModeAtomicSetCursor)(drmModeAtomicReqPtr req, int cursor) = NULL; 25void (*sym_drmModeAtomicSetCursor)(drmModeAtomicReqPtr req, int cursor) = NULL;
26int (*sym_drmModeAtomicMerge)(drmModeAtomicReqPtr base, drmModeAtomicReqPtr augment);
26# endif 27# endif
27void *(*sym_drmModeGetEncoder)(int fd, uint32_t encoder_id) = NULL; 28void *(*sym_drmModeGetEncoder)(int fd, uint32_t encoder_id) = NULL;
28void (*sym_drmModeFreeEncoder)(drmModeEncoderPtr ptr) = NULL; 29void (*sym_drmModeFreeEncoder)(drmModeEncoderPtr ptr) = NULL;
@@ -101,6 +102,7 @@ _ecore_drm2_link(void)
101 SYM(drm_lib, drmModeAtomicAddProperty); 102 SYM(drm_lib, drmModeAtomicAddProperty);
102 SYM(drm_lib, drmModeAtomicCommit); 103 SYM(drm_lib, drmModeAtomicCommit);
103 SYM(drm_lib, drmModeAtomicSetCursor); 104 SYM(drm_lib, drmModeAtomicSetCursor);
105 SYM(drm_lib, drmModeAtomicMerge);
104#endif 106#endif
105 SYM(drm_lib, drmModeGetEncoder); 107 SYM(drm_lib, drmModeGetEncoder);
106 SYM(drm_lib, drmModeFreeEncoder); 108 SYM(drm_lib, drmModeFreeEncoder);
diff --git a/src/lib/ecore_drm2/ecore_drm2_private.h b/src/lib/ecore_drm2/ecore_drm2_private.h
index 3a9f15a..e6dde22 100644
--- a/src/lib/ecore_drm2/ecore_drm2_private.h
+++ b/src/lib/ecore_drm2/ecore_drm2_private.h
@@ -815,6 +815,7 @@ struct _Ecore_Drm2_Device
815 815
816# ifdef HAVE_ATOMIC_DRM 816# ifdef HAVE_ATOMIC_DRM
817 Ecore_Drm2_Atomic_State *state; 817 Ecore_Drm2_Atomic_State *state;
818 drmModeAtomicReq *atomic_req;
818# endif 819# endif
819 820
820 Eina_List *outputs; 821 Eina_List *outputs;
@@ -840,6 +841,7 @@ extern void (*sym_drmModeAtomicFree)(drmModeAtomicReqPtr req);
840extern int (*sym_drmModeAtomicAddProperty)(drmModeAtomicReqPtr req, uint32_t object_id, uint32_t property_id, uint64_t value); 841extern int (*sym_drmModeAtomicAddProperty)(drmModeAtomicReqPtr req, uint32_t object_id, uint32_t property_id, uint64_t value);
841extern int (*sym_drmModeAtomicCommit)(int fd, drmModeAtomicReqPtr req, uint32_t flags, void *user_data); 842extern int (*sym_drmModeAtomicCommit)(int fd, drmModeAtomicReqPtr req, uint32_t flags, void *user_data);
842extern void (*sym_drmModeAtomicSetCursor)(drmModeAtomicReqPtr req, int cursor); 843extern void (*sym_drmModeAtomicSetCursor)(drmModeAtomicReqPtr req, int cursor);
844extern int (*sym_drmModeAtomicMerge)(drmModeAtomicReqPtr base, drmModeAtomicReqPtr augment);
843# endif 845# endif
844extern void *(*sym_drmModeGetEncoder)(int fd, uint32_t encoder_id); 846extern void *(*sym_drmModeGetEncoder)(int fd, uint32_t encoder_id);
845extern void (*sym_drmModeFreeEncoder)(drmModeEncoderPtr ptr); 847extern void (*sym_drmModeFreeEncoder)(drmModeEncoderPtr ptr);