diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2015-08-26 09:29:56 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-08-26 15:14:52 +0200 |
| commit | c5b852f33e7844f4664794a3b3c738d07b09ce0a (patch) | |
| tree | a93b6a305e47890f0c1ad63831f1166d18b8dd06 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | 6c908bf43df417b10917c3a463d3bd413eb476fd (diff) | |
| download | op-kernel-dev-c5b852f33e7844f4664794a3b3c738d07b09ce0a.zip op-kernel-dev-c5b852f33e7844f4664794a3b3c738d07b09ce0a.tar.gz | |
Partially revert "drm/i915: Use full atomic modeset."
This partially reverts commit 74c090b1bdc57b1c9f1361908cca5a3d8a80fb08.
The DRIVER_ATOMIC cap cannot yet be exported because i915 lacks async
support.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 6e03e11..ce3bd0c 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1726,7 +1726,7 @@ static int __init i915_init(void) * to the atomic ioctl and the atomic properties. Only plane operations on * a single CRTC will actually work. */ - if (driver.driver_features & DRIVER_MODESET) + if (i915.nuclear_pageflip) driver.driver_features |= DRIVER_ATOMIC; return drm_pci_init(&driver, &i915_pci_driver); |
