mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-27 04:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

intel: Enable Xe KMD support by default

Browse Source 
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 <jose.souza@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20418>
(cherry picked from commit 31920cb60c)
This commit is contained in:
José Roberto de Souza 2024-01-04 11:55:18 -08:00 committed by Eric Engestrom
parent cbbf9d781b
commit 066c61c748
5 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@ -15094,7 +15094,7 @@
"description": "intel: Enable Xe KMD support by default", "description": "intel: Enable Xe KMD support by default",
"nominated": false, "nominated": false,
"nomination_type": 3, "nomination_type": 3,
"resolution": 4, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": null, "because_sha": null,
"notes": null "notes": null

5
meson.build
View File

@ -1523,11 +1523,6 @@ if with_any_intel and ['x86', 'x86_64'].contains(host_machine.cpu_family())
pre_args += '-DSUPPORT_INTEL_INTEGRATED_GPUS' pre_args += '-DSUPPORT_INTEL_INTEGRATED_GPUS'
endif 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 if with_gallium_i915 and host_machine.cpu_family().startswith('x86') == false
error('Intel "i915" Gallium driver requires x86 or x86_64 CPU family') error('Intel "i915" Gallium driver requires x86 or x86_64 CPU family')
endif endif

9
meson_options.txt
View File

@ -682,11 +682,4 @@ option(
description : 'Build custom xmlconfig (driconf) support. If disabled, ' + description : 'Build custom xmlconfig (driconf) support. If disabled, ' +
'the default driconf file is hardcoded into Mesa. ' + 'the default driconf file is hardcoded into Mesa. ' +
'Requires expat.' 'Requires expat.'
) )
option (
'intel-xe-kmd',
type : 'feature',
value : 'disabled',
description: 'Enable Intel Xe KMD support.'
)

2
src/intel/dev/intel_device_info.c
View File

@ -1667,6 +1667,8 @@ intel_get_device_info_from_fd(int fd, struct intel_device_info *devinfo)
break; break;
case INTEL_KMD_TYPE_XE: case INTEL_KMD_TYPE_XE:
ret = intel_device_info_xe_get_info_from_fd(fd, devinfo); 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; break;
default: default:
ret = false; ret = false;

2
src/intel/dev/intel_kmd.c
View File

@ -37,10 +37,8 @@ intel_get_kmd_type(int fd)
if (strcmp(version->name, "i915") == 0) if (strcmp(version->name, "i915") == 0)
type = INTEL_KMD_TYPE_I915; type = INTEL_KMD_TYPE_I915;
#ifdef INTEL_XE_KMD_SUPPORTED
else if (strcmp(version->name, "xe") == 0) else if (strcmp(version->name, "xe") == 0)
type = INTEL_KMD_TYPE_XE; type = INTEL_KMD_TYPE_XE;
#endif
drmFreeVersion(version); drmFreeVersion(version);
return type; return type;