diff options
| author | Keith Packard <keithp@keithp.com> | 2012-07-10 00:52:11 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-10 00:52:11 -0700 |
| commit | 6e12cb147da58bd12a158807b2cd5afac32ae70f (patch) | |
| tree | 2bf09b363a6f34b3f67a79b1f8fe970e10de2366 /hw/xfree86 | |
| parent | 532fbc29c900469ef4867ccb7eabb953019dcab5 (diff) | |
| parent | 023127915e6922bc53e4c768de760d8a4f25c07c (diff) | |
Merge branch 'local-fixes'
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 16991b38b..e4a6b8613 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -401,6 +401,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) MessageType pix24From = X_DEFAULT; Bool pix24Fail = FALSE; Bool autoconfig = FALSE; + Bool sigio_blocked = FALSE; GDevPtr configured_device; xf86Initialising = TRUE; @@ -821,6 +822,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) #endif xf86AccessEnter(); OsBlockSIGIO(); + sigio_blocked = TRUE; } } @@ -926,7 +928,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); xf86VGAarbiterWrapFunctions(); - OsReleaseSIGIO(); + if (sigio_blocked) + OsReleaseSIGIO(); xf86InitOrigins(); @@ -1011,7 +1014,6 @@ OsVendorInit(void) } #endif #endif - OsReleaseSIGIO(); beenHere = TRUE; } |