devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d3d9ab2296df8e77eb8c6998e5f2cf8860956f13
commit d3d9ab2296df8e77eb8c6998e5f2cf8860956f13
Author: Chris Michael <cp.mich...@samsung.com>
Date: Tue Mar 28 09:18:37 2017 -0400
ecore-drm2: Free any previous atomic request
If we fail the atomic request merge, cleanup any previous request and
just use the new one.
Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
src/lib/ecore_drm2/ecore_drm2_device.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/lib/ecore_drm2/ecore_drm2_device.c
b/src/lib/ecore_drm2/ecore_drm2_device.c
index cb659ad..74284c4 100644
--- a/src/lib/ecore_drm2/ecore_drm2_device.c
+++ b/src/lib/ecore_drm2/ecore_drm2_device.c
@@ -961,7 +961,12 @@ ecore_drm2_atomic_commit_test(Ecore_Drm2_Device *device)
ret = sym_drmModeAtomicMerge(device->atomic_req, req);
if (ret < 0)
{
- /* we failed to merge for some reason. just use this req */
+ /* we failed to merge for some reason. */
+
+ /* clear any previous request */
+ sym_drmModeAtomicFree(device->atomic_req);
+
+ /* just use the new request */
device->atomic_req = req;
}
}
--
