--- a/open-src/driver/xf86-video-mga/sparc-bus-probe.patch Fri Nov 02 15:59:08 2012 -0700
+++ b/open-src/driver/xf86-video-mga/sparc-bus-probe.patch Mon Nov 05 16:17:08 2012 -0800
@@ -1,6 +1,6 @@
---- a/src/mga_driver.c Fri Aug 10 17:30:22 2012
-+++ b/src/mga_driver.c Fri Aug 17 16:33:15 2012
-@@ -120,6 +120,9 @@
+--- a/src/mga_driver.c Thu Oct 18 13:55:11 2012
++++ b/src/mga_driver.c Thu Oct 18 13:57:51 2012
+@@ -109,6 +109,9 @@
static const OptionInfoRec * MGAAvailableOptions(int chipid, int busid);
static void MGAIdentify(int flags);
#ifdef XSERVER_LIBPCIACCESS
@@ -10,7 +10,7 @@
static Bool MGAPciProbe(DriverPtr drv, int entity_num,
struct pci_device * dev, intptr_t match_data);
#else
-@@ -535,7 +538,11 @@
+@@ -510,7 +513,11 @@
MGA_DRIVER_NAME,
MGAIdentify,
#ifdef XSERVER_LIBPCIACCESS
@@ -22,23 +22,24 @@
#else
MGAProbe,
#endif
-@@ -4273,3 +4280,19 @@
-
+@@ -4180,3 +4187,20 @@
+ OUTREG(MGAREG_MACCESS, 1<<15);
+ usleep(10);
}
- #endif
+
+#ifdef __sparc__
+static Bool
+MGACompProbe(DriverPtr drvp, int flags)
+{
-+ static Bool PciInitDone = FALSE;
++ static Bool PciInitDone = FALSE;
+
+ /* Create pci system for use by the driver */
+ if (!PciInitDone) {
-+ xf86BusProbe();
-+ PciInitDone = TRUE;
++ xf86BusProbe();
++ PciInitDone = TRUE;
+ }
+
+ return xf86PciProbeDev(drvp);
+}
+#endif
++