summaryrefslogtreecommitdiff
path: root/src/intel_driver.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-07-25 16:11:23 +1000
committerDave Airlie <airlied@redhat.com>2012-09-03 12:25:07 +1000
commit0768ac4d195214825137152893deb74a87fcd11e (patch)
treed46989b247671ea12bf45711814b47bbd29e90e8 /src/intel_driver.c
parent164ae7a4f9fd3e538f1b506031d297088fc0c659 (diff)
intel: add platform probing support.
This allows the driver to be loaded by the platform loading code. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/intel_driver.c')
-rw-r--r--src/intel_driver.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/intel_driver.c b/src/intel_driver.c
index c5be6793..76d56d92 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -452,7 +452,14 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
return FALSE;
pEnt = xf86GetEntityInfo(scrn->entityList[0]);
- if (pEnt == NULL || pEnt->location.type != BUS_PCI)
+ if (pEnt == NULL)
+ return NULL;
+
+ if (pEnt->location.type != BUS_PCI
+#ifdef XSERVER_PLATFORM_BUS
+ && pEnt->location.type != BUS_PLATFORM
+#endif
+ )
return FALSE;
if (flags & PROBE_DETECT)