@@ -261,16 +261,6 @@
#define PCI_CHIP_CANNONLAKE_12 0x5A44
#define PCI_CHIP_CANNONLAKE_13 0x5A4C
-#define PCI_CHIP_ICELAKE_11_0 0x8A50
-#define PCI_CHIP_ICELAKE_11_1 0x8A51
-#define PCI_CHIP_ICELAKE_11_2 0x8A5C
-#define PCI_CHIP_ICELAKE_11_3 0x8A5D
-#define PCI_CHIP_ICELAKE_11_4 0x8A52
-#define PCI_CHIP_ICELAKE_11_5 0x8A5A
-#define PCI_CHIP_ICELAKE_11_6 0x8A5B
-#define PCI_CHIP_ICELAKE_11_7 0x8A71
-#define PCI_CHIP_ICELAKE_11_8 0x8A70
-
#define IS_MOBILE(devid) ((devid) == PCI_CHIP_I855_GM || \
(devid) == PCI_CHIP_I915_GM || \
(devid) == PCI_CHIP_I945_GM || \
@@ -554,20 +544,6 @@
#define IS_GEN10(devid) (IS_CANNONLAKE(devid))
-#define IS_ICELAKE_11(devid) ((devid) == PCI_CHIP_ICELAKE_11_0 || \
- (devid) == PCI_CHIP_ICELAKE_11_1 || \
- (devid) == PCI_CHIP_ICELAKE_11_2 || \
- (devid) == PCI_CHIP_ICELAKE_11_3 || \
- (devid) == PCI_CHIP_ICELAKE_11_4 || \
- (devid) == PCI_CHIP_ICELAKE_11_5 || \
- (devid) == PCI_CHIP_ICELAKE_11_6 || \
- (devid) == PCI_CHIP_ICELAKE_11_7 || \
- (devid) == PCI_CHIP_ICELAKE_11_8)
-
-#define IS_ICELAKE(devid) (IS_ICELAKE_11(devid))
-
-#define IS_GEN11(devid) (IS_ICELAKE_11(devid))
-
/* New platforms use kernel pci ids */
#include "i915_pciids.h"
@@ -587,6 +563,8 @@ struct pci_device_id {
break; \
__i < __n;})
+#define IS_GEN11(devid) IS_GENX(ICL_11, devid)
+
/* all platforms */
#define IS_9XX(dev) (IS_GEN3(dev) || \
IS_GEN4(dev) || \
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- intel/intel_chipset.h | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-)