hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas_drm: Allocate buffers on demand 

Summary:
Instead of allocating a fixed number of buffers immediately, allocate
buffers if needed to render to.

Normally we only need 2 buffers, but we've been allocating 3 to handle
worse case behaviour.  As T7099 shows, this is not always enough.  We
now cap at a max of 10.

For the normal case where we always use 2 this results in a slight
memory reduction (1 buffer) and a slight renering load reduction
because we pick the oldest buffer to render into.

A future patch will trim the buffer queue if it's been too large for
a long time.

fix T7099
Depends on D6563

Reviewers: devilhorns

Reviewed By: devilhorns

Subscribers: cedric, #committers, zmike

Tags: #efl

Maniphest Tasks: T7099

Differential Revision: https://phab.enlightenment.org/D6564
This commit is contained in:
Derek Foreman 2018-07-10 16:52:46 -04:00 committed by Chris Michael
parent 5d30f2b0b3
commit f7fc06bf86
2 changed files with 21 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/evas/engines/drm/evas_engine.h
View File

@ -62,7 +62,6 @@ struct _Outbuf
struct
{
int num;
Eina_List *fb_list;
Outbuf_Fb *draw;
Ecore_Drm2_Output *output;

82
src/modules/evas/engines/drm/evas_outbuf.c
View File

@ -69,9 +69,6 @@ Outbuf *
_outbuf_setup(Evas_Engine_Info_Drm *info, int w, int h)
{
Outbuf *ob;
Outbuf_Fb *ofb;
char *num;
int i = 0, fw = 0, fh = 0;
ob = calloc(1, sizeof(Outbuf));
if (!ob) return NULL;
@ -88,39 +85,6 @@ _outbuf_setup(Evas_Engine_Info_Drm *info, int w, int h)
ob->priv.output = info->info.output;
ob->priv.num = 3;
num = getenv("EVAS_DRM_BUFFERS");
if (num)
{
ob->priv.num = atoi(num);
if (ob->priv.num <= 0) ob->priv.num = 3;
else if (ob->priv.num > MAX_BUFFERS) ob->priv.num = MAX_BUFFERS;
}
if ((ob->rotation == 0) || (ob->rotation == 180))
{
fw = w;
fh = h;
}
else if ((ob->rotation == 90) || (ob->rotation == 270))
{
fw = h;
fh = w;
}
if ((!w) || (!h)) return ob;
for (i = 0; i < ob->priv.num; i++)
{
ofb = _outbuf_fb_create(ob, fw, fh);
if (!ofb)
{
WRN("Failed to create framebuffer %d", i);
continue;
}
ob->priv.fb_list = eina_list_append(ob->priv.fb_list, ofb);
}
return ob;
}
@ -170,7 +134,6 @@ void
_outbuf_reconfigure(Outbuf *ob, int w, int h, int rotation, Outbuf_Depth depth)
{
Outbuf_Fb *ofb;
int i = 0, fw = 0, fh = 0;
unsigned int format = DRM_FORMAT_ARGB8888;
switch (depth)
@ -225,29 +188,6 @@ _outbuf_reconfigure(Outbuf *ob, int w, int h, int rotation, Outbuf_Depth depth)
EINA_LIST_FREE(ob->priv.fb_list, ofb)
_outbuf_fb_destroy(ofb);
if ((ob->rotation == 0) || (ob->rotation == 180))
{
fw = w;
fh = h;
}
else if ((ob->rotation == 90) || (ob->rotation == 270))
{
fw = h;
fh = w;
}
if ((!w) || (!h)) return;
for (i = 0; i < ob->priv.num; i++)
{
ofb = _outbuf_fb_create(ob, fw, fh);
if (!ofb)
{
WRN("Failed to create framebuffer %d", i);
continue;
}
ob->priv.fb_list = eina_list_append(ob->priv.fb_list, ofb);
}
/* TODO: idle flush */
}
@ -277,10 +217,30 @@ _outbuf_fb_wait(Outbuf *ob)
static Eina_Bool
_outbuf_fb_assign(Outbuf *ob)
{
int fw = 0, fh = 0;
Outbuf_Fb *ofb;
Eina_List *l;
ob->priv.draw = _outbuf_fb_wait(ob);
if (!ob->priv.draw)
{
EINA_SAFETY_ON_TRUE_RETURN_VAL(eina_list_count(ob->priv.fb_list) >= MAX_BUFFERS, EINA_FALSE);
if ((ob->rotation == 0) || (ob->rotation == 180))
{
fw = ob->w;
fh = ob->h;
}
else if ((ob->rotation == 90) || (ob->rotation == 270))
{
fw = ob->h;
fh = ob->w;
}
ob->priv.draw = _outbuf_fb_create(ob, fw, fh);
if (ob->priv.draw)
ob->priv.fb_list = eina_list_append(ob->priv.fb_list, ob->priv.draw);
}
while (!ob->priv.draw)
{
ecore_drm2_fb_release(ob->priv.output, EINA_TRUE);
@ -311,7 +271,7 @@ _outbuf_state_get(Outbuf *ob)
if (!_outbuf_fb_assign(ob)) return MODE_FULL;
age = ob->priv.draw->age;
if (age > ob->priv.num) return MODE_FULL;
if (age > 4) return MODE_FULL;
else if (age == 1) return MODE_COPY;
else if (age == 2) return MODE_DOUBLE;
else if (age == 3) return MODE_TRIPLE;