From 31920cb60c3cf487bc29ebd1d8ad8b1825e09fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Thu, 4 Jan 2024 11:55:18 -0800 Subject: [PATCH] intel: Enable Xe KMD support by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xe KMD landed on drm-next, uAPI is now stable and we can remove the build time parameter to enable support to it but platforms older than Lunar lake will have experimental support with Xe KMD. Signed-off-by: José Roberto de Souza Reviewed-by: Kenneth Graunke Part-of: --- meson.build | 5 ----- meson_options.txt | 9 +-------- src/intel/dev/intel_device_info.c | 2 ++ src/intel/dev/intel_kmd.c | 2 -- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index 25e92ea5f95..f7e02315128 100644 --- a/meson.build +++ b/meson.build @@ -1525,11 +1525,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 7718f32ebfb..caa6004e956 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -710,11 +710,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 062ff7998bc..ba730a4798e 100644 --- a/src/intel/dev/intel_device_info.c +++ b/src/intel/dev/intel_device_info.c @@ -1693,6 +1693,8 @@ intel_get_device_info_from_fd(int fd, struct intel_device_info *devinfo, int min 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;