summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-09-03 20:53:30 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-09-03 23:09:08 +0100
commite3ad18036b4dca29744ecfa4694006f01dd3fd18 (patch)
tree405f3ee8d382b54d8c2dc657ddb78e1c7e7ccfbc
parent3dc644b2a959fc559e1138b332ed42d7235de42f (diff)
sna: Enable platform probing
Completing commit 0768ac4d195214825137152893deb74a87fcd11e Author: Dave Airlie <airlied@redhat.com> Date: Wed Jul 25 16:11:23 2012 +1000 intel: add platform probing support. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_driver.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index a0beb4cf..2eab460b 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -371,7 +371,14 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
return FALSE;
pEnt = xf86GetEntityInfo(scrn->entityList[0]);
- if (pEnt == NULL || pEnt->location.type != BUS_PCI)
+ if (pEnt == NULL)
+ return FALSE;
+
+ if (pEnt->location.type != BUS_PCI
+#ifdef XSERVER_PLATFORM_BUS
+ && pEnt->location.type != BUS_PLATFORM
+#endif
+ )
return FALSE;
if (flags & PROBE_DETECT)