2 files changed, 17 insertions, 3 deletions

diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index 00cd9ab8948d..db28012dbf54 100644
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -17,10 +17,21 @@ config DRM_NOUVEAU
         select INPUT if ACPI && X86
         select THERMAL if ACPI && X86
         select ACPI_VIDEO if ACPI && X86
-        select DRM_VM
         help
           Choose this option for open-source NVIDIA support.
 
+config NOUVEAU_LEGACY_CTX_SUPPORT
+        bool "Nouveau legacy context support"
+        depends on DRM_NOUVEAU
+        select DRM_VM
+        default y
+        help
+          There was a version of the nouveau DDX that relied on legacy
+          ctx ioctls not erroring out. But that was back in time a long
+          ways, so offer a way to disable it now. For uapi compat with
+          old nouveau ddx this should be on by default, but modern distros
+          should consider turning it off.
+
 config NOUVEAU_PLATFORM_DRIVER
         bool "Nouveau (NVIDIA) SoC GPUs"
         depends on DRM_NOUVEAU && ARCH_TEGRA
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 5020265bfbd9..6ab9033f49da 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -1094,8 +1094,11 @@ nouveau_driver_fops = {
 static struct drm_driver
 driver_stub = {
         .driver_features =
-                DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER |
-                DRIVER_KMS_LEGACY_CONTEXT,
+                DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER
+#if defined(CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT)
+                | DRIVER_KMS_LEGACY_CONTEXT
+#endif
+                ,
 
         .open = nouveau_drm_open,
         .postclose = nouveau_drm_postclose,