derekf pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7dd8d6d163f98d6dc706636e8ae62b29480c4201
commit 7dd8d6d163f98d6dc706636e8ae62b29480c4201
Author: Derek Foreman <der...@osg.samsung.com>
Date: Thu Apr 27 15:34:52 2017 -0500
ecore_drm2: Don't use drmModeAtomicMerge
We're creating the entire state from scratch already - trying to merge
with the old state will likely bring in state we just tried to replace.
---
src/lib/ecore_drm2/ecore_drm2_fb.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/lib/ecore_drm2/ecore_drm2_fb.c
b/src/lib/ecore_drm2/ecore_drm2_fb.c
index 4f541ee..39885c6 100644
--- a/src/lib/ecore_drm2/ecore_drm2_fb.c
+++ b/src/lib/ecore_drm2/ecore_drm2_fb.c
@@ -323,18 +323,11 @@ _fb_atomic_flip_test(Ecore_Drm2_Output *output)
{
if (output->atomic_req)
{
- /* merge this test commit with previous */
- ret = sym_drmModeAtomicMerge(output->atomic_req, req);
- if (ret < 0)
- {
- /* we failed to merge for some reason. */
-
- /* clear any previous request */
- sym_drmModeAtomicFree(output->atomic_req);
+ /* clear any previous request */
+ sym_drmModeAtomicFree(output->atomic_req);
- /* just use the new request */
- output->atomic_req = req;
- }
+ /* just use the new request */
+ output->atomic_req = req;
}
else
output->atomic_req = req;
--
