diff options
author | Derek Foreman <derekf@osg.samsung.com> | 2017-05-17 14:53:11 -0500 |
---|---|---|
committer | Derek Foreman <derekf@osg.samsung.com> | 2017-05-17 15:01:54 -0500 |
commit | 2c58d77ba909c9c14dc2d5d19180c67af4accbf3 (patch) | |
tree | 719a111993e6aaeb7ea06e70382d706ee37e762a | |
parent | a9de4a72166d331e23c5ec7df9b14b020b727381 (diff) | |
download | efl-2c58d77ba909c9c14dc2d5d19180c67af4accbf3.tar.gz |
ecore_drm2: Better handle flip failure
We need to release the buffer we couldn't flip to when a flip fails.
This makes whatever bug is causing a page flip to happen right after
dpms blanks the screen, which was leading to a failure to ever wake
from dpms because the flip left a pending buffer that never completed.
Fix T5462
-rw-r--r-- | src/lib/ecore_drm2/ecore_drm2_fb.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/ecore_drm2/ecore_drm2_fb.c b/src/lib/ecore_drm2/ecore_drm2_fb.c index 71ea60df18..3c00a98bd5 100644 --- a/src/lib/ecore_drm2/ecore_drm2_fb.c +++ b/src/lib/ecore_drm2/ecore_drm2_fb.c @@ -570,13 +570,18 @@ ecore_drm2_fb_flip(Ecore_Drm2_Fb *fb, Ecore_Drm2_Output *output) else ret = _fb_flip(output); + if (ret) + { + _release_buffer(output, &output->prep); + return ret; + } output->pending.fb = output->prep.fb; output->prep.fb = NULL; #ifdef HAVE_ATOMIC_DRM output->pending.atomic_req = output->prep.atomic_req; output->prep.atomic_req = NULL; #endif - return ret; + return 0; } EAPI Eina_Bool |