diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-06-05 14:23:43 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-06-05 14:23:43 +0100 |
| commit | e53f0e65e573a39b374464a078220584462b30ec (patch) | |
| tree | 5e6ed1384c91a7d186c39e84905fd5ca5895fb31 | |
| parent | a21bdbe3e312b40b936c5c68c84f5c1bc0f9fb88 (diff) | |
intel: add platform device probing support.platform-probe
| -rw-r--r-- | src/intel_driver.c | 9 | ||||
| -rw-r--r-- | src/intel_module.c | 50 |
2 files changed, 56 insertions, 3 deletions
diff --git a/src/intel_driver.c b/src/intel_driver.c index 67cec488..b9aecb90 100644 --- a/src/intel_driver.c +++ b/src/intel_driver.c @@ -480,7 +480,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) diff --git a/src/intel_module.c b/src/intel_module.c index 4430ac6a..6c7ee14f 100644 --- a/src/intel_module.c +++ b/src/intel_module.c @@ -36,6 +36,10 @@ #include <xorgVersion.h> +#ifdef XSERVER_PLATFORM_BUS +#include <xf86platformBus.h> +#endif + #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,6,99,0,0) #include <xf86Resources.h> #endif @@ -402,11 +406,50 @@ static Bool intel_pci_probe(DriverPtr driver, #if USE_UXA case UXA: return intel_init_scrn(scrn); #endif - + default: return FALSE; } } +#ifdef XSERVER_PLATFORM_BUS +static Bool +intel_platform_probe(DriverPtr driver, + int entity_num, int flags, + struct xf86_platform_device *dev, + intptr_t match_data) +{ + ScrnInfoPtr scrn = NULL; + char *path = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_PATH); + + if (!dev->pdev) + return FALSE; + + chipset_info = (void *)match_data; + + scrn = xf86AllocateScreen(driver, 0); + xf86AddEntityToScreen(scrn, entity_num); + + scrn->driverVersion = INTEL_VERSION; + scrn->driverName = INTEL_DRIVER_NAME; + scrn->name = INTEL_NAME; + scrn->Probe = NULL; + switch (get_accel_method()) { +#if USE_SNA + case SNA: sna_init_scrn(scrn, entity_num); break; +#endif + +#if USE_UXA + case UXA: intel_init_scrn(scrn); break; +#endif + default: break; + } + + xf86DrvMsg(scrn->scrnIndex, X_INFO, + "using drv %s\n", path ? path : "Default device"); + return scrn != NULL; +} +#endif + #ifdef XFree86LOADER static MODULESETUPPROTO(intel_setup); @@ -451,7 +494,10 @@ static DriverRec intel = { 0, intel_driver_func, intel_device_match, - intel_pci_probe + intel_pci_probe, +#ifdef XSERVER_PLATFORM_BUS + intel_platform_probe +#endif }; static pointer intel_setup(pointer module, |