OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loader: default to iris for all future PCI IDs

Browse Source 
The existing "fallback" code didn't actually do anything, so this
removes it, and instead we just always fallback to `iris` for future
PCI IDs.

Suggested-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Engestrom
2019-10-05 22:30:51 +01:00
parent ea8116908c
commit cd04b63c00
6 changed files with 5 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/pci_ids/i965_pci_ids.h
View File

@@ -1,11 +1,3 @@
/*
* IRIS not defined: include all devices supported by i965 or iris
* IRIS == 0: devices where i965 is supported
* IRIS == 1: devices where iris is supported, and will be tried before i965
* IRIS == 2: devices where iris is supported, and will be tried after i965
*/
#if !defined(IRIS) || IRIS == 0
/* Only try to load i965. Do not attempt iris. */
CHIPSET(0x29A2, i965, "Intel(R) 965G")
CHIPSET(0x2992, i965, "Intel(R) 965Q")
CHIPSET(0x2982, i965, "Intel(R) 965G")
@@ -103,9 +95,6 @@ CHIPSET(0x22B0, chv, "Intel(R) HD Graphics (Cherrytrail)")
CHIPSET(0x22B1, chv, "Intel(R) HD Graphics XXX (Braswell)") /* Overridden in brw_get_renderer_string */
CHIPSET(0x22B2, chv, "Intel(R) HD Graphics (Cherryview)")
CHIPSET(0x22B3, chv, "Intel(R) HD Graphics (Cherryview)")
#endif
#if !defined(IRIS) || IRIS == 0 || IRIS == 2
/* First try to load i965, then try iris */
CHIPSET(0x1602, bdw_gt1, "Intel(R) Broadwell GT1")
CHIPSET(0x1606, bdw_gt1, "Intel(R) Broadwell GT1")
CHIPSET(0x160A, bdw_gt1, "Intel(R) Broadwell GT1")
@@ -251,10 +240,3 @@ CHIPSET(0x4500, ehl_4x8, "Intel(R) HD Graphics (Elkhart Lake 4x8)")
CHIPSET(0x4571, ehl_4x8, "Intel(R) HD Graphics (Elkhart Lake 4x8)")
CHIPSET(0x4551, ehl_4x4, "Intel(R) HD Graphics (Elkhart Lake 4x4)")
CHIPSET(0x4541, ehl_2x4, "Intel(R) HD Graphics (Elkhart Lake 2x4)")
#endif
#if !defined(IRIS) || IRIS == 0 || IRIS == 1
/* First try to load iris, then try i965 */
#endif
#if !defined(IRIS) || IRIS == 1
/* Only try to load iris. Do not attempt i965. */
#endif

0
include/pci_ids/iris_pci_ids.h Normal file
View File