diff options
| author | Jordan Justen <[email protected]> | 2019-03-08 16:59:44 -0800 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2019-08-28 13:38:34 -0700 |
| commit | cfbde3282d9b881a8cb09dc7a9c2b25b69872e32 (patch) | |
| tree | 15d2667d74bdb1098a7a0fb1f9dd50136467fbc4 /include | |
| parent | 107c22945fdc1d21c3aaf48f0841cb1289f1669e (diff) | |
pci_id_driver_map: Support preferring iris over i965
This adds the ability for intel devices that:
* Only load on i965
* Only load on iris
* First attempt i965, and try iris next
* First attempt iris, and try i965 next
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'include')
| -rw-r--r-- | include/pci_ids/i965_pci_ids.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/include/pci_ids/i965_pci_ids.h b/include/pci_ids/i965_pci_ids.h index 646df447bd7..7d1d051e4e1 100644 --- a/include/pci_ids/i965_pci_ids.h +++ b/include/pci_ids/i965_pci_ids.h @@ -1,4 +1,11 @@ -#ifndef IRIS +/* + * 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") @@ -97,6 +104,8 @@ CHIPSET(0x22B1, chv, "Intel(R) HD Graphics XXX (Braswell)") /* Overridden in 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") @@ -239,3 +248,10 @@ 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 |