enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

ecore-drm2: Remove old atomic flipping code 

As we are refactoring the usage of hardware planes and atomic commits,
we need to remove the old usage of atomic flipping for ecore_drm2_fb
because atomic flipping will be handled differently.

@fix

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2017-03-27 09:27:19 -04:00
parent 43104a7268
commit 0a647f9fce
1 changed files with 66 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,79 +15,6 @@ _fb2_create(Ecore_Drm2_Fb *fb)
return EINA_TRUE; return EINA_TRUE;
} }
#ifdef HAVE_ATOMIC_DRM
static int
_fb_atomic_flip(Ecore_Drm2_Output *output, Ecore_Drm2_Plane_State *pstate, uint32_t flags)
{
int ret = 0;
drmModeAtomicReq *req = NULL;
Ecore_Drm2_Crtc_State *cstate;
req = sym_drmModeAtomicAlloc();
if (!req) return -1;
sym_drmModeAtomicSetCursor(req, 0);
cstate = output->crtc_state;
ret = sym_drmModeAtomicAddProperty(req, cstate->obj_id, cstate->mode.id,
cstate->mode.value);
if (ret < 0) goto err;
ret = sym_drmModeAtomicAddProperty(req, cstate->obj_id, cstate->active.id,
cstate->active.value);
if (ret < 0) goto err;
ret = sym_drmModeAtomicAddProperty(req, pstate->obj_id,
pstate->cid.id, pstate->cid.value);
if (ret < 0) goto err;
ret = sym_drmModeAtomicAddProperty(req, pstate->obj_id,
pstate->fid.id, pstate->fid.value);
if (ret < 0) goto err;
ret = sym_drmModeAtomicAddProperty(req, pstate->obj_id,
pstate->sx.id, pstate->sx.value);
if (ret < 0) goto err;
ret = sym_drmModeAtomicAddProperty(req, pstate->obj_id,
pstate->sy.id, pstate->sy.value);
if (ret < 0) goto err;
ret = sym_drmModeAtomicAddProperty(req, pstate->obj_id,
pstate->sw.id, pstate->sw.value);
if (ret < 0) goto err;
ret = sym_drmModeAtomicAddProperty(req, pstate->obj_id,
pstate->sh.id, pstate->sh.value);
if (ret < 0) goto err;
ret = sym_drmModeAtomicAddProperty(req, pstate->obj_id,
pstate->cx.id, pstate->cx.value);
if (ret < 0) goto err;
ret = sym_drmModeAtomicAddProperty(req, pstate->obj_id,
pstate->cy.id, pstate->cy.value);
if (ret < 0) goto err;
ret = sym_drmModeAtomicAddProperty(req, pstate->obj_id,
pstate->cw.id, pstate->cw.value);
if (ret < 0) goto err;
ret = sym_drmModeAtomicAddProperty(req, pstate->obj_id,
pstate->ch.id, pstate->ch.value);
if (ret < 0) goto err;
ret = sym_drmModeAtomicCommit(output->fd, req, flags, output->user_data);
if (ret < 0) ERR("Failed to commit Atomic FB Flip: %m");
else ret = 0;
err:
sym_drmModeAtomicFree(req);
return ret;
}
#endif
EAPI Ecore_Drm2_Fb * EAPI Ecore_Drm2_Fb *
ecore_drm2_fb_create(int fd, int width, int height, int depth, int bpp, unsigned int format) ecore_drm2_fb_create(int fd, int width, int height, int depth, int bpp, unsigned int format)
{ {
@ -304,6 +231,8 @@ ecore_drm2_fb_flip_complete(Ecore_Drm2_Output *output)
EAPI int EAPI int
ecore_drm2_fb_flip(Ecore_Drm2_Fb *fb, Ecore_Drm2_Output *output) ecore_drm2_fb_flip(Ecore_Drm2_Fb *fb, Ecore_Drm2_Output *output)
{ {
Eina_Bool repeat;
int count = 0;
int ret = 0; int ret = 0;
EINA_SAFETY_ON_NULL_RETURN_VAL(output, -1); EINA_SAFETY_ON_NULL_RETURN_VAL(output, -1);
@ -332,136 +261,87 @@ ecore_drm2_fb_flip(Ecore_Drm2_Fb *fb, Ecore_Drm2_Output *output)
/* If we don't have an fb to set by now, BAIL! */ /* If we don't have an fb to set by now, BAIL! */
if (!fb) return -1; if (!fb) return -1;
#ifdef HAVE_ATOMIC_DRM if ((!output->current) ||
if (_ecore_drm2_use_atomic) (output->current->strides[0] != fb->strides[0]))
{ {
Ecore_Drm2_Plane_State *pstate; ret =
uint32_t flags = sym_drmModeSetCrtc(fb->fd, output->crtc_id, fb->id,
DRM_MODE_ATOMIC_NONBLOCK | DRM_MODE_PAGE_FLIP_EVENT | output->x, output->y, &output->conn_id, 1,
DRM_MODE_ATOMIC_ALLOW_MODESET; &output->current_mode->info);
if (ret)
pstate = output->plane_state;
pstate->cid.value = output->crtc_id;
pstate->fid.value = fb->id;
pstate->sx.value = 0;
pstate->sy.value = 0;
pstate->sw.value = fb->w << 16;
pstate->sh.value = fb->h << 16;
pstate->cx.value = output->x;
pstate->cy.value = output->y;
pstate->cw.value = output->current_mode->width;
pstate->ch.value = output->current_mode->height;
ret = _fb_atomic_flip(output, pstate, flags);
if ((ret < 0) && (errno != EBUSY))
{ {
ERR("Atomic Pageflip Failed for Crtc %u on Connector %u: %m", ERR("Failed to set Mode %dx%d for Output %s: %m",
output->crtc_id, output->conn_id); output->current_mode->width, output->current_mode->height,
output->name);
return ret; return ret;
} }
else if (ret < 0)
{
output->next = fb;
if (output->next) output->next->busy = EINA_TRUE;
return 0; if (output->current) _release_buffer(output, output->current);
} output->current = fb;
output->current->busy = EINA_TRUE;
output->pending = fb; output->next = NULL;
output->pending->busy = EINA_TRUE; /* We used to return here, but now that the ticker is fixed this
* can leave us hanging waiting for a tick to happen forever.
return 0; * Instead, we now fall through the the flip path to make sure
* even this first set can cause a flip callback.
*/
} }
else
#endif do
{ {
Eina_Bool repeat; static Eina_Bool bugged_about_bug = EINA_FALSE;
int count = 0; repeat = EINA_FALSE;
ret = sym_drmModePageFlip(fb->fd, output->crtc_id, fb->id,
if ((!output->current) || DRM_MODE_PAGE_FLIP_EVENT,
(output->current->strides[0] != fb->strides[0])) output->user_data);
/* Some drivers (RPI - looking at you) are broken and produce
* flip events before they are ready for another flip, so be
* a little robust in the face of badness and try a few times
* until we can flip or we give up (100 tries with a yield
* between each try). We can't expect everyone to run the
* latest bleeding edge kernel IF a workaround is possible
* in userspace, so do this.
* We only report this as an ERR once since if it will
* generate a huge amount of spam otherwise. */
if ((ret < 0) && (errno == EBUSY))
{ {
ret = repeat = EINA_TRUE;
sym_drmModeSetCrtc(fb->fd, output->crtc_id, fb->id, if (count == 0 && !bugged_about_bug)
output->x, output->y, &output->conn_id, 1,
&output->current_mode->info);
if (ret)
{ {
ERR("Failed to set Mode %dx%d for Output %s: %m", ERR("Pageflip fail - EBUSY from drmModePageFlip - "
output->current_mode->width, output->current_mode->height, "This is either a kernel bug or an EFL one.");
output->name); bugged_about_bug = EINA_TRUE;
return ret;
} }
count++;
if (output->current) _release_buffer(output, output->current); if (count > 500)
output->current = fb;
output->current->busy = EINA_TRUE;
output->next = NULL;
/* We used to return here, but now that the ticker is fixed this
* can leave us hanging waiting for a tick to happen forever.
* Instead, we now fall through the the flip path to make sure
* even this first set can cause a flip callback.
*/
}
do
{
static Eina_Bool bugged_about_bug = EINA_FALSE;
repeat = EINA_FALSE;
ret = sym_drmModePageFlip(fb->fd, output->crtc_id, fb->id,
DRM_MODE_PAGE_FLIP_EVENT,
output->user_data);
/* Some drivers (RPI - looking at you) are broken and produce
* flip events before they are ready for another flip, so be
* a little robust in the face of badness and try a few times
* until we can flip or we give up (100 tries with a yield
* between each try). We can't expect everyone to run the
* latest bleeding edge kernel IF a workaround is possible
* in userspace, so do this.
* We only report this as an ERR once since if it will
* generate a huge amount of spam otherwise. */
if ((ret < 0) && (errno == EBUSY))
{ {
repeat = EINA_TRUE; ERR("Pageflip EBUSY for %i tries - give up", count);
if (count == 0 && !bugged_about_bug) break;
{
ERR("Pageflip fail - EBUSY from drmModePageFlip - "
"This is either a kernel bug or an EFL one.");
bugged_about_bug = EINA_TRUE;
}
count++;
if (count > 500)
{
ERR("Pageflip EBUSY for %i tries - give up", count);
break;
}
usleep(100);
} }
usleep(100);
} }
while (repeat); }
while (repeat);
if ((ret == 0) && (count > 0)) if ((ret == 0) && (count > 0))
DBG("Pageflip finally succeeded after %i tries due to EBUSY", count); DBG("Pageflip finally succeeded after %i tries due to EBUSY", count);
if ((ret < 0) && (errno != EBUSY)) if ((ret < 0) && (errno != EBUSY))
{ {
ERR("Pageflip Failed for Crtc %u on Connector %u: %m", ERR("Pageflip Failed for Crtc %u on Connector %u: %m",
output->crtc_id, output->conn_id); output->crtc_id, output->conn_id);
return ret; return ret;
} }
else if (ret < 0) else if (ret < 0)
{ {
output->next = fb; output->next = fb;
output->next->busy = EINA_TRUE; output->next->busy = EINA_TRUE;
return 0;
}
output->pending = fb;
output->pending->busy = EINA_TRUE;
return 0; return 0;
} }
output->pending = fb;
output->pending->busy = EINA_TRUE;
return 0;
} }
EAPI Eina_Bool EAPI Eina_Bool