xserver: Branch 'master'
Dave Airlie
airlied at kemper.freedesktop.org
Wed Dec 19 16:12:21 PST 2007
hw/xfree86/common/xf86Bus.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 7ef7727b800fa4715b80a82850d65b88fde5fe6c
Author: Dave Airlie <airlied at clockmaker.usersys.redhat.com>
Date: Thu Dec 20 10:11:26 2007 +1000
entity sharing: make !shareable entity non-fatal.
Just because the entity isn't shareable, we should bring down the server.
Just ignore the extra screen and keep going.
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index 599f7a4..f7ffac8 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -290,8 +290,10 @@ xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex)
if (entityIndex == -1)
return;
if (xf86Entities[entityIndex]->inUse &&
- !(xf86Entities[entityIndex]->entityProp & IS_SHARED_ACCEL))
- FatalError("Requested Entity already in use!\n");
+ !(xf86Entities[entityIndex]->entityProp & IS_SHARED_ACCEL)) {
+ ErrorF("Requested Entity already in use!\n");
+ return;
+ }
pScrn->numEntities++;
pScrn->entityList = xnfrealloc(pScrn->entityList,
More information about the xorg-commit
mailing list