diff --git a/.pick_status.json b/.pick_status.json
index 652c4ce0ea0..debfb077158 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -15094,7 +15094,7 @@
         "description": "intel: Enable Xe KMD support by default",
         "nominated": false,
         "nomination_type": 3,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/meson.build b/meson.build
index 4d6cbee89f1..8963b314256 100644
--- a/meson.build
+++ b/meson.build
@@ -1523,11 +1523,6 @@ if with_any_intel and ['x86', 'x86_64'].contains(host_machine.cpu_family())
   pre_args += '-DSUPPORT_INTEL_INTEGRATED_GPUS'
 endif
 
-if get_option('intel-xe-kmd').enabled()
-  pre_args += '-DINTEL_XE_KMD_SUPPORTED'
-endif
-
-
 if with_gallium_i915 and host_machine.cpu_family().startswith('x86') == false
   error('Intel "i915" Gallium driver requires x86 or x86_64 CPU family')
 endif
diff --git a/meson_options.txt b/meson_options.txt
index 92ffd1d6c40..500a2eb695f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -682,11 +682,4 @@ option(
   description : 'Build custom xmlconfig (driconf) support. If disabled, ' +
                 'the default driconf file is hardcoded into Mesa. ' +
                 'Requires expat.'
-)
-
-option (
-  'intel-xe-kmd',
-  type : 'feature',
-  value : 'disabled',
-  description: 'Enable Intel Xe KMD support.'
-)
+)
\ No newline at end of file
diff --git a/src/intel/dev/intel_device_info.c b/src/intel/dev/intel_device_info.c
index 1ed313d71a2..c94982a3666 100644
--- a/src/intel/dev/intel_device_info.c
+++ b/src/intel/dev/intel_device_info.c
@@ -1667,6 +1667,8 @@ intel_get_device_info_from_fd(int fd, struct intel_device_info *devinfo)
       break;
    case INTEL_KMD_TYPE_XE:
       ret = intel_device_info_xe_get_info_from_fd(fd, devinfo);
+      if (devinfo->verx10 < 200)
+         mesa_logw("Support for this platform is experimental with Xe KMD, bug reports may be ignored.");
       break;
    default:
       ret = false;
diff --git a/src/intel/dev/intel_kmd.c b/src/intel/dev/intel_kmd.c
index cca27ce67ed..63bb443424a 100644
--- a/src/intel/dev/intel_kmd.c
+++ b/src/intel/dev/intel_kmd.c
@@ -37,10 +37,8 @@ intel_get_kmd_type(int fd)
 
    if (strcmp(version->name, "i915") == 0)
       type = INTEL_KMD_TYPE_I915;
-#ifdef INTEL_XE_KMD_SUPPORTED
    else if (strcmp(version->name, "xe") == 0)
       type = INTEL_KMD_TYPE_XE;
-#endif
 
    drmFreeVersion(version);
    return type;