diff options
author | Derek Foreman <derekf@osg.samsung.com> | 2017-05-09 10:33:05 -0500 |
---|---|---|
committer | Derek Foreman <derekf@osg.samsung.com> | 2017-05-09 10:34:33 -0500 |
commit | 544cffaa19fca975970e773b209c40c40d1208d6 (patch) | |
tree | 7b36afc324e32d7651569eb37f777ec9c7a31e9e /src/lib/ecore_drm2/ecore_drm2_fb.c | |
parent | 8067b0146a4e27f2b2550dc9d0029a86bbf7b566 (diff) |
ecore_drm2: Move test for atomic_req into atomic flip path
We ended up doing an occasional atomic ioctl when we shouldn't.
This should be a harmless failure, but it's also a pointless one.
Diffstat (limited to '')
-rw-r--r-- | src/lib/ecore_drm2/ecore_drm2_fb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/ecore_drm2/ecore_drm2_fb.c b/src/lib/ecore_drm2/ecore_drm2_fb.c index 5de93f8ff7..1b2c4d95a3 100644 --- a/src/lib/ecore_drm2/ecore_drm2_fb.c +++ b/src/lib/ecore_drm2/ecore_drm2_fb.c | |||
@@ -374,6 +374,11 @@ _fb_atomic_flip(Ecore_Drm2_Output *output) | |||
374 | DRM_MODE_ATOMIC_NONBLOCK | DRM_MODE_PAGE_FLIP_EVENT | | 374 | DRM_MODE_ATOMIC_NONBLOCK | DRM_MODE_PAGE_FLIP_EVENT | |
375 | DRM_MODE_ATOMIC_ALLOW_MODESET; | 375 | DRM_MODE_ATOMIC_ALLOW_MODESET; |
376 | 376 | ||
377 | /* If we have no req yet, we're flipping to current state. | ||
378 | * rebuild the current state in the prep state */ | ||
379 | if (!output->prep.atomic_req) _fb_atomic_flip_test(output); | ||
380 | |||
381 | /* Still no req is a bad situation */ | ||
377 | EINA_SAFETY_ON_NULL_RETURN_VAL(output->prep.atomic_req, -1); | 382 | EINA_SAFETY_ON_NULL_RETURN_VAL(output->prep.atomic_req, -1); |
378 | 383 | ||
379 | res = | 384 | res = |
@@ -518,11 +523,6 @@ ecore_drm2_fb_flip(Ecore_Drm2_Fb *fb, Ecore_Drm2_Output *output) | |||
518 | if (!fb) return -1; | 523 | if (!fb) return -1; |
519 | 524 | ||
520 | output->prep.fb = fb; | 525 | output->prep.fb = fb; |
521 | #ifdef HAVE_ATOMIC_DRM | ||
522 | /* If we have no req yet, we're flipping to current state. | ||
523 | * rebuild the current state in the prep state */ | ||
524 | if (!output->prep.atomic_req) _fb_atomic_flip_test(output); | ||
525 | #endif | ||
526 | 526 | ||
527 | if (_ecore_drm2_use_atomic) | 527 | if (_ecore_drm2_use_atomic) |
528 | ret = _fb_atomic_flip(output); | 528 | ret = _fb_atomic_flip(output); |