diff --git a/meson.build b/meson.build
index e25f9fcde39ec..a1692bfb0b3ce 100644
--- a/meson.build
+++ b/meson.build
@@ -355,14 +355,6 @@ with_platform_wayland = _platforms.contains('wayland')
 with_platform_haiku = _platforms.contains('haiku')
 with_platform_windows = _platforms.contains('windows')
 
-if _platforms.contains('surfaceless')
-  warning('Platform `surfaceless` is now always selected; setting this option will be an error in Mesa 20.3')
-endif
-
-if _platforms.contains('drm')
-  warning('Platform `drm` is now automatically selected; setting this option will be an error in Mesa 20.3')
-endif
-
 if _platforms.length() != 0
   egl_native_platform = _platforms[0]
 else
diff --git a/meson_options.txt b/meson_options.txt
index 7637c4cbb739f..1847928cea23e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -23,8 +23,7 @@ option(
   type : 'array',
   value : ['auto'],
   choices : [
-    'auto', 'x11', 'wayland', 'drm', 'surfaceless', 'haiku', 'android',
-    'windows',
+    'auto', 'x11', 'wayland', 'haiku', 'android', 'windows',
   ],
   description : 'window systems to support. If this is set to `auto`, all platforms applicable will be enabled.'
 )