diff options
Diffstat (limited to 'x11/modular-xorg-server/patches/patch-sb')
-rw-r--r-- | x11/modular-xorg-server/patches/patch-sb | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/x11/modular-xorg-server/patches/patch-sb b/x11/modular-xorg-server/patches/patch-sb index 16b729757f0..2d7a7df16d0 100644 --- a/x11/modular-xorg-server/patches/patch-sb +++ b/x11/modular-xorg-server/patches/patch-sb @@ -1,9 +1,7 @@ -$NetBSD: patch-sb,v 1.2 2009/06/07 11:23:47 wiz Exp $ +$NetBSD: patch-sb,v 1.2.10.1 2010/07/04 07:31:14 agc Exp $ -Temporary disable Sbus suport. - ---- hw/xfree86/common/xf86Configure.c.orig 2009-03-21 01:57:50 +0200 -+++ hw/xfree86/common/xf86Configure.c 2009-05-19 14:36:57 +0300 +--- hw/xfree86/common/xf86Configure.c.orig 2009-10-12 02:52:40.000000000 +0000 ++++ hw/xfree86/common/xf86Configure.c @@ -115,7 +115,7 @@ xf86AddBusDeviceToConfigure(const char * return NULL; isPrimary = xf86IsPrimaryPci(pVideo); @@ -13,3 +11,20 @@ Temporary disable Sbus suport. case BUS_SBUS: for (i = 0; i < nDevToConfig; i++) if (DevToConfig[i].sVideo && +@@ -180,8 +180,14 @@ xf86AddBusDeviceToConfigure(const char * + + NewDevice.GDev.busID = xnfalloc(16); + xf86FormatPciBusNumber(pVideo->bus, busnum); +- sprintf(NewDevice.GDev.busID, "PCI:%s:%d:%d", +- busnum, pVideo->dev, pVideo->func); ++ ++ if (pVideo->domain == 0) { ++ snprintf(NewDevice.GDev.busID, 16, "PCI:%s:%d:%d", ++ busnum, pVideo->dev, pVideo->func); ++ } else { ++ snprintf(NewDevice.GDev.busID, 16, "PCI:%s@%d:%d:%d", ++ busnum, pVideo->domain, pVideo->dev, pVideo->func); ++ } + + NewDevice.GDev.chipID = pVideo->device_id; + NewDevice.GDev.chipRev = pVideo->revision; |