| commit | d8fc8031b6d62ebc89050d0f7afc536b83d25162 | [log] [tgz] |
|---|---|---|
| author | John Stultz <john.stultz@linaro.org> | Tue Dec 14 20:42:41 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 20:42:41 2021 +0000 |
| tree | bcd857ed709746221362cd12ac3a0c451a54a762 | |
| parent | d1c37433d9a6f9467f50808620f7cad89998bbb6 [diff] | |
| parent | 51fd1b6fdeaa34f67484932847855775861701fb [diff] |
drm_hwcomposer: Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 774e5e3432 am: 24ccb88ece am: 42f5da5192 am: 51fd1b6fde Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/1921343 Change-Id: I1e0f8ce3f2c32662bf03e30249915210075fd1aa
diff --git a/drm/VSyncWorker.cpp b/drm/VSyncWorker.cpp index 6e92838..ed5fd9b 100644 --- a/drm/VSyncWorker.cpp +++ b/drm/VSyncWorker.cpp
@@ -101,7 +101,7 @@ vsync.tv_nsec = int(phased_timestamp - (vsync.tv_sec * kOneSecondNs)); do { ret = clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &vsync, nullptr); - } while (ret == -1 && errno == EINTR); + } while (ret == EINTR); if (ret) return ret;