diff options
author | Derek Foreman <derekf@osg.samsung.com> | 2016-09-07 22:25:43 -0500 |
---|---|---|
committer | Derek Foreman <derekf@osg.samsung.com> | 2016-09-07 22:41:20 -0500 |
commit | 28c0133697ec967a3fe7b3940d872bd9471acedd (patch) | |
tree | b90b68b5ddae686790fd83651f7db6d46872e518 | |
parent | 07e60306c3b90be334deb5441f9848f679e5c5fa (diff) | |
download | efl-28c0133697ec967a3fe7b3940d872bd9471acedd.tar.gz |
drm_ee: simplify flippingdevs/derekf/drm2_ticking
We no longer have to track draw and display buffers - the display buffer
is completely handled by ecore_evas_drm's busy tracking.
-rw-r--r-- | src/modules/evas/engines/drm/evas_engine.h | 2 | ||||
-rw-r--r-- | src/modules/evas/engines/drm/evas_outbuf.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/modules/evas/engines/drm/evas_engine.h b/src/modules/evas/engines/drm/evas_engine.h index 3a5c3c23a7..f125379431 100644 --- a/src/modules/evas/engines/drm/evas_engine.h +++ b/src/modules/evas/engines/drm/evas_engine.h @@ -58,7 +58,7 @@ struct _Outbuf struct { int num; - Outbuf_Fb ofb[4], *draw, *display; + Outbuf_Fb ofb[4], *draw; Ecore_Drm2_Output *output; Eina_List *pending; Eina_Rectangle *rects; diff --git a/src/modules/evas/engines/drm/evas_outbuf.c b/src/modules/evas/engines/drm/evas_outbuf.c index 470cc9a009..e1a3a17ffc 100644 --- a/src/modules/evas/engines/drm/evas_outbuf.c +++ b/src/modules/evas/engines/drm/evas_outbuf.c @@ -29,9 +29,7 @@ _outbuf_buffer_swap(Outbuf *ob, Eina_Rectangle *rects, unsigned int count) if (!ofb) return; ecore_drm2_fb_dirty(ofb->fb, rects, count); - if (ecore_drm2_fb_flip(ofb->fb, ob->priv.output) == 0) - ob->priv.display = ofb; - + ecore_drm2_fb_flip(ofb->fb, ob->priv.output); ofb->drawn = EINA_TRUE; ofb->age = 0; @@ -242,7 +240,6 @@ _outbuf_fb_wait(Outbuf *ob) */ for (i = 0; i < ob->priv.num; i++) { - if (&ob->priv.ofb[i] == ob->priv.display) continue; if (ecore_drm2_fb_busy_get(ob->priv.ofb[i].fb)) continue; if (ob->priv.ofb[i].valid && (ob->priv.ofb[i].age > best_age)) { |