frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

os: Recompute whether any clients are ready after check_timers() 

If a driver calls AttendClient() from within a timer callback we
need to re-compute the local 'are_ready' to prevent the attended
client from waiting until WaitForSomething() times out.

This is a fix similar to commit 9ed5b263.

Signed-off-by: Damien Leone <dleone@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit f33cb42643)
This commit is contained in:
Damien Leone 2018-06-18 16:24:28 -07:00 committed by Adam Jackson
parent 180ab06d45
commit 8c2f0f8cbd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
os/WaitFor.c
View File

@ -190,10 +190,11 @@ WaitForSomething(Bool are_ready)
/* deal with any blocked jobs */ /* deal with any blocked jobs */
if (workQueue) { if (workQueue) {
ProcessWorkQueue(); ProcessWorkQueue();
are_ready = clients_are_ready();
} }
timeout = check_timers(); timeout = check_timers();
are_ready = clients_are_ready();
if (are_ready) if (are_ready)
timeout = 0; timeout = 0;