devilhorns pushed a commit to branch feature/wayland/multi-output. http://git.enlightenment.org/core/efl.git/commit/?id=62dd968ab1968cdd018f631772048950c3ff4d9a
commit 62dd968ab1968cdd018f631772048950c3ff4d9a Author: Chris Michael <[email protected]> Date: Wed Feb 21 14:21:01 2018 -0500 ecore-drm2: Pass 'output' as data during atomic commits With the changes coming to ecore_evas_drm, we need to be passing the output as data to these functions so that in the callbacks, we have the output to work with so we can properly pass the output rectangle to things like ecore_animator_tick @fix Signed-off-by: Chris Michael <[email protected]> --- src/lib/ecore_drm2/ecore_drm2_outputs.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/ecore_drm2/ecore_drm2_outputs.c b/src/lib/ecore_drm2/ecore_drm2_outputs.c index 5f332e752d..a5b9e3d38d 100644 --- a/src/lib/ecore_drm2/ecore_drm2_outputs.c +++ b/src/lib/ecore_drm2/ecore_drm2_outputs.c @@ -1284,8 +1284,8 @@ _output_mode_atomic_set(Ecore_Drm2_Output *output, Ecore_Drm2_Output_Mode *mode) goto err; } - ret = sym_drmModeAtomicCommit(output->fd, req, DRM_MODE_ATOMIC_ALLOW_MODESET, - output->user_data); + ret = sym_drmModeAtomicCommit(output->fd, req, + DRM_MODE_ATOMIC_ALLOW_MODESET, output); if (ret < 0) { ERR("Failed to commit atomic Mode: %m"); @@ -1531,8 +1531,7 @@ ecore_drm2_output_rotation_set(Ecore_Drm2_Output *output, int rotation) pstate->rotation.id, rotation); if (res < 0) goto err; - res = sym_drmModeAtomicCommit(output->fd, req, flags, - output->user_data); + res = sym_drmModeAtomicCommit(output->fd, req, flags, output); if (res < 0) goto err; else --
