diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-09 08:17:19 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-09 08:17:19 +0200 |
| commit | 98fa64178af8ad608e19391053b40b0772466c64 (patch) | |
| tree | 841e3eebe0277bdf98441dd45224c039e069d3b8 /xorg-server/dix/dixutils.c | |
| parent | 405ae9defaaa03d4d305b6264a744107c3dd460d (diff) | |
| parent | c29d91cfd8df084f16d0d2dfa82c3a86f7719a73 (diff) | |
| download | vcxsrv-98fa64178af8ad608e19391053b40b0772466c64.tar.gz vcxsrv-98fa64178af8ad608e19391053b40b0772466c64.tar.bz2 vcxsrv-98fa64178af8ad608e19391053b40b0772466c64.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/include/misc.h
Diffstat (limited to 'xorg-server/dix/dixutils.c')
| -rw-r--r-- | xorg-server/dix/dixutils.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/xorg-server/dix/dixutils.c b/xorg-server/dix/dixutils.c index b249a810b..3f24629b4 100644 --- a/xorg-server/dix/dixutils.c +++ b/xorg-server/dix/dixutils.c @@ -386,6 +386,9 @@ BlockHandler(pointer pTimeout, pointer pReadmask) for (i = 0; i < screenInfo.numScreens; i++) (*screenInfo.screens[i]->BlockHandler) (screenInfo.screens[i], pTimeout, pReadmask); + for (i = 0; i < screenInfo.numGPUScreens; i++) + (*screenInfo.gpuscreens[i]->BlockHandler) (screenInfo.gpuscreens[i], + pTimeout, pReadmask); for (i = 0; i < numHandlers; i++) if (!handlers[i].deleted) (*handlers[i].BlockHandler) (handlers[i].blockData, @@ -422,6 +425,9 @@ WakeupHandler(int result, pointer pReadmask) for (i = 0; i < screenInfo.numScreens; i++) (*screenInfo.screens[i]->WakeupHandler) (screenInfo.screens[i], result, pReadmask); + for (i = 0; i < screenInfo.numGPUScreens; i++) + (*screenInfo.gpuscreens[i]->WakeupHandler) (screenInfo.gpuscreens[i], + result, pReadmask); if (handlerDeleted) { for (i = 0; i < numHandlers;) if (handlers[i].deleted) { |