From: Thierry Reding <[email protected]>
When kernel mode-setting is disabled, mark the driver as legacy to pick
up the special semantics required for userspace mode-setting.
Signed-off-by: Thierry Reding <treding at nvidia.com>
---
drivers/gpu/drm/i915/i915_drv.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 2d05d7ce4c29..ea916e117f01 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -985,13 +985,19 @@ static int __init i915_init(void)
#if defined(CONFIG_DRM_I915_KMS)
if (i915.modeset != 0)
driver.driver_features |= DRIVER_MODESET;
+ else
+ driver.driver_features |= DRIVER_LEGACY;
#endif
if (i915.modeset == 1)
driver.driver_features |= DRIVER_MODESET;
+ else
+ driver.driver_features |= DRIVER_LEGACY;
#ifdef CONFIG_VGA_CONSOLE
- if (vgacon_text_force() && i915.modeset == -1)
+ if (vgacon_text_force() && i915.modeset == -1) {
driver.driver_features &= ~DRIVER_MODESET;
+ driver.driver_features |= DRIVER_LEGACY;
+ }
#endif
if (!(driver.driver_features & DRIVER_MODESET)) {
--
1.8.4.2