From 9da0f52642706057dc71894a490ede658580d48b Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Thu, 27 Apr 2017 16:52:09 -0500 Subject: [PATCH] ecore_drm2: remove fb parameter from _fb_flip() Time to start smashing the atomic and non-atomic paths together. --- src/lib/ecore_drm2/ecore_drm2_fb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/lib/ecore_drm2/ecore_drm2_fb.c b/src/lib/ecore_drm2/ecore_drm2_fb.c index 1a3b40c..2018e12 100644 --- a/src/lib/ecore_drm2/ecore_drm2_fb.c +++ b/src/lib/ecore_drm2/ecore_drm2_fb.c @@ -369,12 +369,15 @@ _fb_atomic_flip(Ecore_Drm2_Output *output) } static int -_fb_flip(Ecore_Drm2_Output *output, Ecore_Drm2_Fb *fb) +_fb_flip(Ecore_Drm2_Output *output) { + Ecore_Drm2_Fb *fb; Eina_Bool repeat; int count = 0; int ret = 0; + fb = output->prep.fb; + if (output->pending.fb) { if (output->next.fb) _release_buffer(output, output->next.fb); @@ -490,10 +493,12 @@ ecore_drm2_fb_flip(Ecore_Drm2_Fb *fb, Ecore_Drm2_Output *output) if (!output->enabled) return -1; + output->prep.fb = fb; + if (_ecore_drm2_use_atomic) ret = _fb_atomic_flip(output); else - ret = _fb_flip(output, fb); + ret = _fb_flip(output); return ret; } -- 2.7.4