devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9d5c76e0d59588670a5125853c3fe17310bc9d17
commit 9d5c76e0d59588670a5125853c3fe17310bc9d17 Author: Chris Michael <[email protected]> Date: Mon Mar 27 13:35:36 2017 -0400 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 <[email protected]> --- src/lib/ecore_drm2/ecore_drm2.c | 2 ++ src/lib/ecore_drm2/ecore_drm2_private.h | 2 ++ 2 files changed, 4 insertions(+) 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; int (*sym_drmModeAtomicAddProperty)(drmModeAtomicReqPtr req, uint32_t object_id, uint32_t property_id, uint64_t value) = NULL; int (*sym_drmModeAtomicCommit)(int fd, drmModeAtomicReqPtr req, uint32_t flags, void *user_data) = NULL; void (*sym_drmModeAtomicSetCursor)(drmModeAtomicReqPtr req, int cursor) = NULL; +int (*sym_drmModeAtomicMerge)(drmModeAtomicReqPtr base, drmModeAtomicReqPtr augment); # endif void *(*sym_drmModeGetEncoder)(int fd, uint32_t encoder_id) = NULL; void (*sym_drmModeFreeEncoder)(drmModeEncoderPtr ptr) = NULL; @@ -101,6 +102,7 @@ _ecore_drm2_link(void) SYM(drm_lib, drmModeAtomicAddProperty); SYM(drm_lib, drmModeAtomicCommit); SYM(drm_lib, drmModeAtomicSetCursor); + SYM(drm_lib, drmModeAtomicMerge); #endif SYM(drm_lib, drmModeGetEncoder); 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 # ifdef HAVE_ATOMIC_DRM Ecore_Drm2_Atomic_State *state; + drmModeAtomicReq *atomic_req; # endif Eina_List *outputs; @@ -840,6 +841,7 @@ extern void (*sym_drmModeAtomicFree)(drmModeAtomicReqPtr req); extern int (*sym_drmModeAtomicAddProperty)(drmModeAtomicReqPtr req, uint32_t object_id, uint32_t property_id, uint64_t value); extern int (*sym_drmModeAtomicCommit)(int fd, drmModeAtomicReqPtr req, uint32_t flags, void *user_data); extern void (*sym_drmModeAtomicSetCursor)(drmModeAtomicReqPtr req, int cursor); +extern int (*sym_drmModeAtomicMerge)(drmModeAtomicReqPtr base, drmModeAtomicReqPtr augment); # endif extern void *(*sym_drmModeGetEncoder)(int fd, uint32_t encoder_id); extern void (*sym_drmModeFreeEncoder)(drmModeEncoderPtr ptr); --
