X Strike Force X.Org X11 SVN commit: r529 - branches/6.9/debian/patches/general
Author: dnusinow
Date: 2005-08-15 00:08:18 -0500 (Mon, 15 Aug 2005)
New Revision: 529
Removed:
branches/6.9/debian/patches/general/080_pci_isolate_device_feature.diff
Log:
Actually remove patch from previous commit
Deleted: branches/6.9/debian/patches/general/080_pci_isolate_device_feature.diff
===================================================================
--- branches/6.9/debian/patches/general/080_pci_isolate_device_feature.diff 2005-08-15 05:02:37 UTC (rev 528)
+++ branches/6.9/debian/patches/general/080_pci_isolate_device_feature.diff 2005-08-15 05:08:18 UTC (rev 529)
@@ -1,164 +0,0 @@
-$Id$
-
-Implement IsolateDevice and SingleCard layout options for XF86Config, and
--isolateDevice command-line flag for XFree86 X server. Useful for
-multi-card setups where different X servers run on each card.
-
-This patch by Aivils Stoss <Aivils.Stoss@unibanka.lv>; copyright and
-license as below. Minor modifications by Andreas Schuldei and Branden
-Robinson; documentation added by Branden Robinson.
-
- Copyright 2003 Aivils Stoss.
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
-Index: xc/programs/Xserver/hw/xfree86/Xorg.man
-===================================================================
---- xc/programs/Xserver/hw/xfree86/Xorg.man.orig 2005-08-02 22:05:09.000000000 -0400
-+++ xc/programs/Xserver/hw/xfree86/Xorg.man 2005-08-02 23:53:12.000000000 -0400
-@@ -270,6 +270,19 @@
- .I bustype
- is anything other than \(oqPCI\(cq.
- .TP 8
-+.B \-isolateDevice \fIbus\-id\fP
-+Restrict device resets to the device at
-+.IR bus\-id .
-+The
-+.I bus\-id
-+string has the form
-+.IB bustype : bus : device : function
-+(e.g., \(oqPCI:1:0:0\(cq).
-+At present, only isolation of PCI devices is supported; i.e., this option
-+is ignored if
-+.I bustype
-+is anything other than \(oqPCI\(cq.
-+.TP 8
- .B \-keeptty
- Prevent the server from detaching its initial controlling terminal.
- This option is only useful when debugging the server. Not all platforms
-Index: xc/programs/Xserver/hw/xfree86/common/xf86Config.c
-===================================================================
---- xc/programs/Xserver/hw/xfree86/common/xf86Config.c.orig 2005-08-02 23:44:53.000000000 -0400
-+++ xc/programs/Xserver/hw/xfree86/common/xf86Config.c 2005-08-02 23:53:12.000000000 -0400
-@@ -1685,6 +1685,20 @@
- {0}, FALSE },
- };
-
-+typedef enum {
-+ LAYOUT_ISOLATEDEVICE,
-+ LAYOUT_SINGLECARD
-+} LayoutValues;
-+
-+static OptionInfoRec LayoutOptions[] = {
-+ { LAYOUT_ISOLATEDEVICE, "IsolateDevice", OPTV_STRING,
-+ {0}, FALSE },
-+ { LAYOUT_SINGLECARD, "SingleCard", OPTV_BOOLEAN,
-+ {0}, FALSE },
-+ { -1, NULL, OPTV_NONE,
-+ {0}, FALSE },
-+};
-+
- /*
- * figure out which layout is active, which screens are used in that layout,
- * which drivers and monitors are used in these screens
-@@ -2665,6 +2679,29 @@
- }
- }
-
-+ xf86ProcessOptions(-1, xf86ConfigLayout.options, LayoutOptions);
-+
-+ if ((scanptr = xf86GetOptValString(LayoutOptions, LAYOUT_ISOLATEDEVICE))) {
-+ ; /* IsolateDevice specified; overrides SingleCard */
-+ } else {
-+ xf86GetOptValBool(LayoutOptions, LAYOUT_SINGLECARD, &singlecard);
-+ if (singlecard)
-+ scanptr = xf86ConfigLayout.screens->screen->device->busID;
-+ }
-+ if (scanptr) {
-+ int bus, device, func, stroffset = 0;
-+ if (strncmp(scanptr, "PCI:", 4) != 0) {
-+ xf86Msg(X_WARNING, "Bus types other than PCI not yet isolable.\n"
-+ "\tIgnoring IsolateDevice option.\n");
-+ } else if (sscanf(scanptr, "PCI:%d:%d:%d", &bus, &device, &func) == 3) {
-+ xf86IsolateDevice.bus = bus;
-+ xf86IsolateDevice.device = device;
-+ xf86IsolateDevice.func = func;
-+ xf86Msg(X_INFO,
-+ "Isolating PCI bus \"%d:%d:%d\"\n", bus, device, func);
-+ }
-+ }
-+
- /* Now process everything else */
-
- if (!configFiles(xf86configptr->conf_files) ||
-Index: xc/programs/Xserver/hw/xfree86/common/xf86Globals.c
-===================================================================
---- xc/programs/Xserver/hw/xfree86/common/xf86Globals.c.orig 2005-08-02 22:04:16.000000000 -0400
-+++ xc/programs/Xserver/hw/xfree86/common/xf86Globals.c 2005-08-02 23:53:12.000000000 -0400
-@@ -242,6 +242,7 @@
- #endif
- RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
- Bool xf86inSuspend = FALSE;
-+PciBusId xf86IsolateDevice;
- Bool xorgHWAccess = FALSE;
- PciBusId xf86IsolateDevice;
-
-Index: xc/programs/Xserver/hw/xfree86/common/xf86Init.c
-===================================================================
---- xc/programs/Xserver/hw/xfree86/common/xf86Init.c.orig 2005-08-02 23:25:32.000000000 -0400
-+++ xc/programs/Xserver/hw/xfree86/common/xf86Init.c 2005-08-02 23:53:12.000000000 -0400
-@@ -1736,6 +1736,25 @@
- return 0;
- }
- }
-+ if (!strcmp(argv[i], "-isolateDevice"))
-+ {
-+ int bus, device, func;
-+ if (++i >= argc)
-+ return 0;
-+ if (strncmp(argv[i], "PCI:", 4)) {
-+ ErrorF("Bus types other than PCI not yet isolable\n");
-+ return 0;
-+ }
-+ if (sscanf(argv[i], "PCI:%d:%d:%d", &bus, &device, &func) == 3) {
-+ xf86IsolateDevice.bus = bus;
-+ xf86IsolateDevice.device = device;
-+ xf86IsolateDevice.func = func;
-+ return 2;
-+ } else {
-+ ErrorF("Invalid isolated device specifiation\n");
-+ return 0;
-+ }
-+ }
- /* OS-specific processing */
- return xf86ProcessArgument(argc, argv, i);
- }
-Index: xc/programs/Xserver/hw/xfree86/xorg.conf.man
-===================================================================
---- xc/programs/Xserver/hw/xfree86/xorg.conf.man.orig 2005-08-02 22:05:09.000000000 -0400
-+++ xc/programs/Xserver/hw/xfree86/xorg.conf.man 2005-08-02 23:53:12.000000000 -0400
-@@ -1689,7 +1689,7 @@
- section provides information specific to the whole session, including
- session-specific
- .BR Options .
--The
-+In addition to options specific to this section (described below), the
- .B ServerFlags
- options (described above) may be specified here, and ones given here
- override those given in the
Reply to: