75 lines
2.4 KiB
Diff
75 lines
2.4 KiB
Diff
From 5823527cf87c781df10620048c984d52fa529647 Mon Sep 17 00:00:00 2001
|
|
From: Thierry Reding <treding@nvidia.com>
|
|
Date: Thu, 13 Feb 2014 13:31:31 +0100
|
|
Subject: [PATCH v2 1/2] xfree86: Fallback to first platform device as primary
|
|
|
|
When neither of the various bus implementations was able to find a
|
|
primary bus and device, fallback to using the platform bus as primary
|
|
bus and the first platform device as primary device.
|
|
|
|
Signed-off-by: Thierry Reding <treding@nvidia.com>
|
|
Reviewed-by: Rob Clark <robdclark@gmail.com>
|
|
Tested-by: Rob Clark <robdclark@gmail.com>
|
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
---
|
|
hw/xfree86/common/xf86Bus.c | 3 +++
|
|
hw/xfree86/common/xf86platformBus.c | 15 +++++++++++++++
|
|
hw/xfree86/common/xf86platformBus.h | 1 +
|
|
3 files changed, 19 insertions(+)
|
|
|
|
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
|
|
index b3b3f8c..bd3e4e3 100644
|
|
--- a/hw/xfree86/common/xf86Bus.c
|
|
+++ b/hw/xfree86/common/xf86Bus.c
|
|
@@ -210,6 +210,9 @@ xf86BusProbe(void)
|
|
#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
|
|
xf86SbusProbe();
|
|
#endif
|
|
+#ifdef XSERVER_PLATFORM_BUS
|
|
+ xf86platformPrimary();
|
|
+#endif
|
|
}
|
|
|
|
/*
|
|
diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
|
|
index eb1a3fb..74d63c2 100644
|
|
--- a/hw/xfree86/common/xf86platformBus.c
|
|
+++ b/hw/xfree86/common/xf86platformBus.c
|
|
@@ -635,4 +635,21 @@ void xf86platformVTProbe(void)
|
|
xf86PlatformReprobeDevice(i, xf86_platform_devices[i].attribs);
|
|
}
|
|
}
|
|
+
|
|
+void xf86platformPrimary(void)
|
|
+{
|
|
+ /* use the first platform device as a fallback */
|
|
+ if (primaryBus.type == BUS_NONE) {
|
|
+ xf86Msg(X_INFO, "no primary bus or device found\n");
|
|
+
|
|
+ if (xf86_num_platform_devices > 0) {
|
|
+ char *syspath = xf86_get_platform_attrib(0, ODEV_ATTRIB_SYSPATH);
|
|
+
|
|
+ primaryBus.id.plat = &xf86_platform_devices[0];
|
|
+ primaryBus.type = BUS_PLATFORM;
|
|
+
|
|
+ xf86Msg(X_NONE, "\tfalling back to %s\n", syspath);
|
|
+ }
|
|
+ }
|
|
+}
|
|
#endif
|
|
diff --git a/hw/xfree86/common/xf86platformBus.h b/hw/xfree86/common/xf86platformBus.h
|
|
index 5dee4e0..dec1956 100644
|
|
--- a/hw/xfree86/common/xf86platformBus.h
|
|
+++ b/hw/xfree86/common/xf86platformBus.h
|
|
@@ -77,6 +77,7 @@ extern _X_EXPORT int
|
|
xf86PlatformMatchDriver(char *matches[], int nmatches);
|
|
|
|
extern void xf86platformVTProbe(void);
|
|
+extern void xf86platformPrimary(void);
|
|
#endif
|
|
|
|
#endif
|
|
--
|
|
2.1.0
|
|
|