SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

entity sharing: make !shareable entity non-fatal.

Browse Source 
Just because the entity isn't shareable, we should bring down the server.
Just ignore the extra screen and keep going.
This commit is contained in:
Dave Airlie
2007-12-20 10:11:26 +10:00
parent 50e80c3987
commit 7ef7727b80
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/common/xf86Bus.c
View File

@@ -290,8 +290,10 @@ xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex)
if (entityIndex == -1) if (entityIndex == -1)
return; return;
if (xf86Entities[entityIndex]->inUse && if (xf86Entities[entityIndex]->inUse &&
!(xf86Entities[entityIndex]->entityProp & IS_SHARED_ACCEL)) !(xf86Entities[entityIndex]->entityProp & IS_SHARED_ACCEL)) {
FatalError("Requested Entity already in use!\n"); ErrorF("Requested Entity already in use!\n");
return;
}
pScrn->numEntities++; pScrn->numEntities++;
pScrn->entityList = xnfrealloc(pScrn->entityList, pScrn->entityList = xnfrealloc(pScrn->entityList,