ecore_drm2: Don't use drmModeAtomicMerge

We're creating the entire state from scratch already - trying to merge
with the old state will likely bring in state we just tried to replace.
This commit is contained in:
Derek Foreman 2017-04-27 15:34:52 -05:00
parent eb305727d0
commit 7dd8d6d163
1 changed files with 4 additions and 11 deletions

View File

@ -323,18 +323,11 @@ _fb_atomic_flip_test(Ecore_Drm2_Output *output)
{
if (output->atomic_req)
{
/* merge this test commit with previous */
ret = sym_drmModeAtomicMerge(output->atomic_req, req);
if (ret < 0)
{
/* we failed to merge for some reason. */
/* clear any previous request */
sym_drmModeAtomicFree(output->atomic_req);
/* clear any previous request */
sym_drmModeAtomicFree(output->atomic_req);
/* just use the new request */
output->atomic_req = req;
}
/* just use the new request */
output->atomic_req = req;
}
else
output->atomic_req = req;