diff options
| author | Fredrik Höglund <fredrik@kde.org> | 2015-09-10 16:17:59 +0200 |
|---|---|---|
| committer | Fredrik Höglund <fredrik@kde.org> | 2015-09-10 16:17:59 +0200 |
| commit | 0489a0eda8c49a1bad5d0f67b04a37264e31ff5e (patch) | |
| tree | 86a60fd1b3dd48523874fcee2599f5e14a81dd8e | |
| parent | 634e357be2ec400f63bd5c42f706b709b6ddabc3 (diff) | |
Otherwise we stash an uninitalized value, and later use it to compute
the msc_offset for the window. Also initialize ust and crtc_msc so we
never use uninitalized values when present_get_ust_msc fails.
This fixes clients getting stuck waiting indefinitely for an idle
event when a CRTC is turned off.
Signed-off-by: Fredrik Höglund <fredrik@kde.org>
| -rw-r--r-- | present/present.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/present/present.c b/present/present.c index a6346015e..7ddffbd28 100644 --- a/present/present.c +++ b/present/present.c @@ -710,9 +710,9 @@ present_pixmap(WindowPtr window, present_notify_ptr notifies, int num_notifies) { - uint64_t ust; + uint64_t ust = 0; uint64_t target_msc; - uint64_t crtc_msc; + uint64_t crtc_msc = 0; int ret; present_vblank_ptr vblank, tmp; ScreenPtr screen = window->drawable.pScreen; @@ -734,13 +734,15 @@ present_pixmap(WindowPtr window, target_crtc = present_get_crtc(window); } - present_get_ust_msc(screen, target_crtc, &ust, &crtc_msc); + ret = present_get_ust_msc(screen, target_crtc, &ust, &crtc_msc); target_msc = present_window_to_crtc_msc(window, target_crtc, window_msc, crtc_msc); - /* Stash the current MSC away in case we need it later - */ - window_priv->msc = crtc_msc; + if (ret == Success) { + /* Stash the current MSC away in case we need it later + */ + window_priv->msc = crtc_msc; + } /* Adjust target_msc to match modulus */ |