diff options
| author | Erik Faye-Lund <kusmabite@gmail.com> | 2014-02-10 22:59:42 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-07-09 11:44:56 +0200 |
| commit | 0440a07aa83d3fca521e79222ab89a04148564bf (patch) | |
| tree | a78f6e4b3974eda01e311afe68fc7b55d28fcecf | |
| parent | 01f7bcf7067633653b8e8e52bcda86c8edd2fd7a (diff) | |
Build with older Xorg video-driver ABIs
By conditionally using platform-bus, we don't require such a recent
Xorg video-driver ABI. So let's only do platform-bus if the ABI is
recent enough, and fall back to normal probing if not.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
| -rw-r--r-- | src/driver.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/driver.c b/src/driver.c index 79e9f2f..6434f0e 100644 --- a/src/driver.c +++ b/src/driver.c @@ -39,7 +39,9 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "compiler.h" +#ifdef XSERVER_PLATFORM_BUS #include "xf86platformBus.h" +#endif #include "mipointer.h" #include "micmap.h" @@ -334,10 +336,12 @@ TegraPreInit(ScrnInfoPtr pScrn, int flags) pScrn->rgbBits = 8; switch (pEnt->location.type) { +#ifdef XSERVER_PLATFORM_BUS case BUS_PLATFORM: path = xf86_get_platform_device_attrib(pEnt->location.id.plat, ODEV_ATTRIB_PATH); break; +#endif default: path = xf86GetOptValString(tegra->pEnt->device->options, @@ -772,6 +776,7 @@ TegraValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) return MODE_OK; } +#ifdef XSERVER_PLATFORM_BUS static Bool TegraPlatformProbe(DriverPtr driver, int entity_num, int flags, struct xf86_platform_device *dev, intptr_t match_data) @@ -802,6 +807,7 @@ TegraPlatformProbe(DriverPtr driver, int entity_num, int flags, return scrn != NULL; } +#endif static Bool TegraProbe(DriverPtr drv, int flags) @@ -867,7 +873,9 @@ _X_EXPORT DriverRec tegra = { TegraDriverFunc, NULL, NULL, +#ifdef XSERVER_PLATFORM_BUS TegraPlatformProbe, +#endif }; static MODULESETUPPROTO(Setup); |