fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/dev: remove ADLN references

Browse source 
Not used anymore, just use the existing ADL definitions.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34433>
This commit is contained in:
Lionel Landwerlin 2025-04-10 20:39:59 +03:00 • committed by Marge Bot
parent 938f79ed82
commit bcaf08b47c
4 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/pci_ids/iris_pci_ids.h
View file

@ -184,11 +184,11 @@ CHIPSET(0x46c1, adl_gt2, "ADL GT2", "Intel(R) Graphics")
CHIPSET(0x46c2, adl_gt2, "ADL GT2", "Intel(R) Graphics") CHIPSET(0x46c2, adl_gt2, "ADL GT2", "Intel(R) Graphics")
CHIPSET(0x46c3, adl_gt2, "ADL GT2", "Intel(R) Graphics") CHIPSET(0x46c3, adl_gt2, "ADL GT2", "Intel(R) Graphics")
CHIPSET(0x46d0, adl_n, "ADL-N", "Intel(R) Graphics") CHIPSET(0x46d0, adl_gt1, "ADL-N", "Intel(R) Graphics")
CHIPSET(0x46d1, adl_n, "ADL-N", "Intel(R) Graphics") CHIPSET(0x46d1, adl_gt1, "ADL-N", "Intel(R) Graphics")
CHIPSET(0x46d2, adl_n, "ADL-N", "Intel(R) Graphics") CHIPSET(0x46d2, adl_gt05, "ADL-N", "Intel(R) Graphics")
CHIPSET(0x46d3, adl_n, "ADL-N", "Intel(R) Graphics") CHIPSET(0x46d3, adl_gt1, "ADL-N", "Intel(R) Graphics")
CHIPSET(0x46d4, adl_n, "ADL-N", "Intel(R) Graphics") CHIPSET(0x46d4, adl_gt1, "ADL-N", "Intel(R) Graphics")
CHIPSET(0x9a40, tgl_gt2, "TGL GT2", "Intel(R) Iris(R) Xe Graphics") CHIPSET(0x9a40, tgl_gt2, "TGL GT2", "Intel(R) Iris(R) Xe Graphics")
CHIPSET(0x9a49, tgl_gt2, "TGL GT2", "Intel(R) Iris(R) Xe Graphics") CHIPSET(0x9a49, tgl_gt2, "TGL GT2", "Intel(R) Iris(R) Xe Graphics")

8
src/intel/dev/intel_device_info.c
View file

@ -984,12 +984,6 @@ static const struct intel_device_info intel_device_info_adl_gt1 = {
.platform = INTEL_PLATFORM_ADL, .platform = INTEL_PLATFORM_ADL,
}; };
static const struct intel_device_info intel_device_info_adl_n = {
GFX12_GT_CONFIG(1),
.platform = INTEL_PLATFORM_ADL,
.is_adl_n = true,
};
static const struct intel_device_info intel_device_info_adl_gt2 = { static const struct intel_device_info intel_device_info_adl_gt2 = {
GFX12_GT_CONFIG(2), GFX12_GT_CONFIG(2),
.platform = INTEL_PLATFORM_ADL, .platform = INTEL_PLATFORM_ADL,
@ -1858,7 +1852,7 @@ intel_get_device_info_from_fd(int fd, struct intel_device_info *devinfo, int min
drmFreeDevice(&drmdev); drmFreeDevice(&drmdev);
return false; return false;
} }
if ((min_ver > 0 && devinfo->ver < min_ver) || (max_ver > 0 && devinfo->ver > max_ver)) { if ((min_ver > 0 && devinfo->ver < min_ver) || (max_ver > 0 && devinfo->ver > max_ver)) {
drmFreeDevice(&drmdev); drmFreeDevice(&drmdev);
return false; return false;

3
src/intel/dev/intel_device_info.h
View file

@ -55,9 +55,6 @@ extern "C" {
#define intel_device_info_is_mtl(devinfo) \ #define intel_device_info_is_mtl(devinfo) \
intel_platform_in_range((devinfo)->platform, MTL) intel_platform_in_range((devinfo)->platform, MTL)
#define intel_device_info_is_adln(devinfo) \
(devinfo->is_adl_n == true)
#define intel_device_info_is_arl(devinfo) \ #define intel_device_info_is_arl(devinfo) \
intel_platform_in_range((devinfo)->platform, ARL) intel_platform_in_range((devinfo)->platform, ARL)

2
src/intel/dev/intel_device_info.py
View file

@ -318,8 +318,6 @@ Struct("intel_device_info",
when TBIMR is enabled, which has been seen to lead to hangs. To avoid the when TBIMR is enabled, which has been seen to lead to hangs. To avoid the
issue we simply pad the push constant payload to be at least 1 register.""")), issue we simply pad the push constant payload to be at least 1 register.""")),
Member("bool", "is_adl_n", comment="We need this for ADL-N specific Wa_14014966230."),
Member("unsigned", "num_slices", Member("unsigned", "num_slices",
comment=dedent("""\ comment=dedent("""\
GPU hardware limits GPU hardware limits