From: Svetoslav S. <ga...@st...> - 2003-01-07 14:23:24
|
> >this patch has always troubled me. > > Me to, but I use 6 months. isn't it possible to get smth like this working ( i know it's incomplete:( ) diff -Naur XFree86-4.2.99.3/xc/programs/Xserver/hw/xfree86/common/xf86Init.c XFree86-4.2.99.3patched/xc/programs/Xserver/hw/xfree86/common/xf86Init.c --- XFree86-4.2.99.3/xc/programs/Xserver/hw/xfree86/common/xf86Init.c 2002-12-03 19:17:40.000000000 +0100 +++ XFree86-4.2.99.3patched/xc/programs/Xserver/hw/xfree86/common/xf86Init.c 2003-01-07 15:06:54.000000000 +0100 @@ -104,6 +104,8 @@ #endif static Bool formatsDone = FALSE; +Bool xf86concurrentX = FALSE; /* allow concurrent runing XFree instances */ + InputDriverRec xf86KEYBOARD = { 1, "keyboard", @@ -1277,6 +1279,11 @@ xf86ProbeOnly = TRUE; return 1; } + if (!strcmp(argv[i],"-concurrentX")) + { + xf86concurrentX = TRUE; + return 1; + } if (!strcmp(argv[i],"-flipPixels")) { xf86FlipPixels = TRUE; diff -Naur XFree86-4.2.99.3/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c XFree86-4.2.99.3patched/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c --- XFree86-4.2.99.3/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c 2002-12-12 05:12:01.000000000 +0100 +++ XFree86-4.2.99.3patched/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c 2003-01-07 14:36:45.000000000 +0100 @@ -576,8 +576,10 @@ #ifdef DEBUG ErrorF("pciIoAccessDisable: 0x%05lx\n", *(PCITAG *)arg); #endif +#if ( xf86concurrentX == FALSE ) pArg->ctrl &= ~SETBITS; (*pArg->func)(pArg->tag, PCI_CMD_STAT_REG, pArg->ctrl); +#endif } #undef SETBITS @@ -598,8 +600,10 @@ #ifdef DEBUG ErrorF("pciIo_MemAccessDisable: 0x%05lx\n", *(PCITAG *)arg); #endif +#if ( xf86concurrentX == FALSE ) pArg->ctrl &= ~SETBITS; (*pArg->func)(pArg->tag, PCI_CMD_STAT_REG, pArg->ctrl); +#endif } #undef SETBITS @@ -620,8 +624,10 @@ #ifdef DEBUG ErrorF("pciMemAccessDisable: 0x%05lx\n", *(PCITAG *)arg); #endif +#if ( xf86concurrentX == FALSE ) pArg->ctrl &= ~SETBITS; (*pArg->func)(pArg->tag, PCI_CMD_STAT_REG, pArg->ctrl); +#endif } #undef SETBITS #undef pArg diff -Naur XFree86-4.2.99.3/xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h XFree86-4.2.99.3patched/xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h --- XFree86-4.2.99.3/xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h 2002-09-18 18:31:57.000000000 +0200 +++ XFree86-4.2.99.3patched/xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h 2003-01-07 14:46:18.000000000 +0100 @@ -115,6 +115,8 @@ /* Other things */ Bool allowMouseOpenFail; + Bool concurrentX; /* allow concurrent running X + * instances */ Bool vidModeEnabled; /* VidMode extension enabled */ Bool vidModeAllowNonLocal; /* allow non-local VidMode * connections */ > >it seems to disable some kind of pci > >resource locking, but as is i'm sure the xfree people wouldn't accept > >it. > > IMHO XFree developed for runnig multiple locale X servers over > single videocard. Att-F1 switch to X1, Alt-F2 switch to X2 and so on. > In this case absolutely necessary disable first X before run second X. > > But we have a different situation. Two or more X needs to run > simultaneous. Unknow NetBSD hacker create this patch and we use it. > > >if we wrap it in a configuration option, can we get it accepted > >upstream? > > I try very match config variants. All failed for me. I need patch. > > >is the patch only required when using a dual head card and two > >x servers are poking the same card? > > IMHO XFree ready for poking the same card. > > >does anyone know why you'd want this kind of locking going on anyway? > is > >it to avoid two x servers trying to drive the same head? > > Don't know. > > Why I do not ask for patch XFree folks? > IMHO if alone psihodelic-shizo-programmer create a working linux kernel, > he > should not distrub others. > Latest 2-3 months 2.4.XX ruby version runs for me stable. In abstract > I > should > ask need this stuff any other or not? > Unfortunately 2.5.XX status is unknow. > > Aivils Stoss > > > > ------------------------------------------------------- > This SF.NET email is sponsored by: > SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See! > http://www.vasoftware.com > _______________________________________________ > Linuxconsole-dev mailing list > Lin...@li... > https://lists.sourceforge.net/lists/listinfo/linuxconsole-dev > |