Signed-off-by: Lucas De Marchi <lucas.demar...@intel.com>
---
intel/intel_chipset.h | 33 +--------------------------------
1 file changed, 1 insertion(+), 32 deletions(-)
diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
index 163fb536..82f3b5a0 100644
--- a/intel/intel_chipset.h
+++ b/intel/intel_chipset.h
@@ -246,21 +246,6 @@
#define PCI_CHIP_WHISKEYLAKE_U_GT3_2 0x3EA3
#define PCI_CHIP_WHISKEYLAKE_U_GT3_3 0x3EA4
-#define PCI_CHIP_CANNONLAKE_0 0x5A51
-#define PCI_CHIP_CANNONLAKE_1 0x5A59
-#define PCI_CHIP_CANNONLAKE_2 0x5A41
-#define PCI_CHIP_CANNONLAKE_3 0x5A49
-#define PCI_CHIP_CANNONLAKE_4 0x5A52
-#define PCI_CHIP_CANNONLAKE_5 0x5A5A
-#define PCI_CHIP_CANNONLAKE_6 0x5A42
-#define PCI_CHIP_CANNONLAKE_7 0x5A4A
-#define PCI_CHIP_CANNONLAKE_8 0x5A50
-#define PCI_CHIP_CANNONLAKE_9 0x5A40
-#define PCI_CHIP_CANNONLAKE_10 0x5A54
-#define PCI_CHIP_CANNONLAKE_11 0x5A5C
-#define PCI_CHIP_CANNONLAKE_12 0x5A44
-#define PCI_CHIP_CANNONLAKE_13 0x5A4C
-
#define IS_MOBILE(devid) ((devid) == PCI_CHIP_I855_GM || \
(devid) == PCI_CHIP_I915_GM || \
(devid) == PCI_CHIP_I945_GM || \
@@ -527,23 +512,6 @@
IS_GEMINILAKE(devid) || \
IS_COFFEELAKE(devid))
-#define IS_CANNONLAKE(devid) ((devid) == PCI_CHIP_CANNONLAKE_0 || \
- (devid) == PCI_CHIP_CANNONLAKE_1 || \
- (devid) == PCI_CHIP_CANNONLAKE_2 || \
- (devid) == PCI_CHIP_CANNONLAKE_3 || \
- (devid) == PCI_CHIP_CANNONLAKE_4 || \
- (devid) == PCI_CHIP_CANNONLAKE_5 || \
- (devid) == PCI_CHIP_CANNONLAKE_6 || \
- (devid) == PCI_CHIP_CANNONLAKE_7 || \
- (devid) == PCI_CHIP_CANNONLAKE_8 || \
- (devid) == PCI_CHIP_CANNONLAKE_9 || \
- (devid) == PCI_CHIP_CANNONLAKE_10 || \
- (devid) == PCI_CHIP_CANNONLAKE_11 || \
- (devid) == PCI_CHIP_CANNONLAKE_12 || \
- (devid) == PCI_CHIP_CANNONLAKE_13)
-
-#define IS_GEN10(devid) (IS_CANNONLAKE(devid))
-
/* New platforms use kernel pci ids */
#include "i915_pciids.h"
@@ -563,6 +531,7 @@ struct pci_device_id {
break; \
__i < __n;})
+#define IS_GEN10(devid) IS_GENX(CNL, devid)
#define IS_GEN11(devid) IS_GENX(ICL_11, devid)
/* all platforms */
--
2.17.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
