enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

ecore_drm2: Fix flip test error handling 

We need to free the atomic req if commit fails, so let's merge these
failure paths and simplify code a bit.
This commit is contained in:
Derek Foreman 2017-05-04 13:41:16 -05:00
parent 699ed066ea
commit 7628977fbf
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/lib/ecore_drm2/ecore_drm2_fb.c
View File

@ -252,7 +252,6 @@ ecore_drm2_fb_flip_complete(Ecore_Drm2_Output *output)
Eina_Bool
_fb_atomic_flip_test(Ecore_Drm2_Output *output)
{
Eina_Bool res = EINA_FALSE;
#ifdef HAVE_ATOMIC_DRM
int ret = 0;
Eina_List *l;
@ -349,30 +348,21 @@ _fb_atomic_flip_test(Ecore_Drm2_Output *output)
ret =
sym_drmModeAtomicCommit(output->fd, req, flags, NULL);
if (ret < 0) ERR("Failed Atomic Commit Test: %m");
else res = EINA_TRUE;
if (ret < 0) goto err;
if (res)
{
if (output->prep.atomic_req)
{
/* clear any previous request */
sym_drmModeAtomicFree(output->prep.atomic_req);
/* clear any previous request */
if (output->prep.atomic_req)
sym_drmModeAtomicFree(output->prep.atomic_req);
/* just use the new request */
output->prep.atomic_req = req;
}
else
output->prep.atomic_req = req;
}
output->prep.atomic_req = req;
return EINA_TRUE;
return res;
err:
DBG("Failed Atomic Test: %m");
sym_drmModeAtomicFree(req);
#endif
return res;
return EINA_FALSE;
}
static int