diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-08-09 11:34:39 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-08-09 11:46:24 +0100 |
| commit | b6b5c3f009585151eb772dfc2526843c7cee82b3 (patch) | |
| tree | 63ab8d9eb0a2eb4864db92bc5250d3909fe76238 /src/intel_module.c | |
| parent | ab445c23079a76eaa2a7d499ec4755599012bd2f (diff) | |
intel: Disable incompatible features whilst hosted
Start adding the infrastructure to disable direct hardware access if X
is being run under a system compositor (aka "hosted").
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/intel_module.c')
| -rw-r--r-- | src/intel_module.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/intel_module.c b/src/intel_module.c index 47e494c3..42fa8d8b 100644 --- a/src/intel_module.c +++ b/src/intel_module.c @@ -382,6 +382,9 @@ static Bool intel_driver_func(ScrnInfoPtr pScrn, #else (*flag) = HW_IO | HW_MMIO; #endif + if (hosted()) + (*flag) = HW_SKIP_CONSOLE; + return TRUE; default: /* Unknown or deprecated function */ @@ -410,6 +413,9 @@ static enum accel_method { UXA, SNA } get_accel_method(void) enum accel_method accel_method = DEFAULT_ACCEL_METHOD; XF86ConfDevicePtr dev; + if (hosted()) + return SNA; + dev = _xf86findDriver("intel", xf86configptr->conf_device_lst); if (dev && dev->dev_option_lst) { const char *s; @@ -493,7 +499,8 @@ static Bool intel_pci_probe(DriverPtr driver, case PCI_CHIP_I810_DC100: case PCI_CHIP_I810_E: case PCI_CHIP_I815: - break; + if (!hosted()) + break; default: return FALSE; } |