| リビジョン | 8e7eb3bcfee06a6c680b6c30753c7a633c1fc85c (tree) |
|---|---|
| 日時 | 2018-09-06 08:14:27 |
| 作者 | Lucas De Marchi <lucas.demarchi@inte...> |
| コミッター | Rodrigo Vivi |
intel: make gen11 use generic gen macro
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
intel/intel_chipset.c (diff)
intel/intel_chipset.h (diff)| @@ -35,6 +35,7 @@ static const struct pci_device { | ||
| 35 | 35 | uint16_t gen; |
| 36 | 36 | } pciids[] = { |
| 37 | 37 | /* Keep ids sorted by gen; latest gen first */ |
| 38 | + INTEL_ICL_11_IDS(11), | |
| 38 | 39 | }; |
| 39 | 40 | |
| 40 | 41 | bool intel_is_genx(unsigned int devid, int gen) |
| @@ -261,16 +261,6 @@ | ||
| 261 | 261 | #define PCI_CHIP_CANNONLAKE_12 0x5A44 |
| 262 | 262 | #define PCI_CHIP_CANNONLAKE_13 0x5A4C |
| 263 | 263 | |
| 264 | -#define PCI_CHIP_ICELAKE_11_0 0x8A50 | |
| 265 | -#define PCI_CHIP_ICELAKE_11_1 0x8A51 | |
| 266 | -#define PCI_CHIP_ICELAKE_11_2 0x8A5C | |
| 267 | -#define PCI_CHIP_ICELAKE_11_3 0x8A5D | |
| 268 | -#define PCI_CHIP_ICELAKE_11_4 0x8A52 | |
| 269 | -#define PCI_CHIP_ICELAKE_11_5 0x8A5A | |
| 270 | -#define PCI_CHIP_ICELAKE_11_6 0x8A5B | |
| 271 | -#define PCI_CHIP_ICELAKE_11_7 0x8A71 | |
| 272 | -#define PCI_CHIP_ICELAKE_11_8 0x8A70 | |
| 273 | - | |
| 274 | 264 | #define IS_MOBILE(devid) ((devid) == PCI_CHIP_I855_GM || \ |
| 275 | 265 | (devid) == PCI_CHIP_I915_GM || \ |
| 276 | 266 | (devid) == PCI_CHIP_I945_GM || \ |
| @@ -554,26 +544,14 @@ | ||
| 554 | 544 | |
| 555 | 545 | #define IS_GEN10(devid) (IS_CANNONLAKE(devid)) |
| 556 | 546 | |
| 557 | -#define IS_ICELAKE_11(devid) ((devid) == PCI_CHIP_ICELAKE_11_0 || \ | |
| 558 | - (devid) == PCI_CHIP_ICELAKE_11_1 || \ | |
| 559 | - (devid) == PCI_CHIP_ICELAKE_11_2 || \ | |
| 560 | - (devid) == PCI_CHIP_ICELAKE_11_3 || \ | |
| 561 | - (devid) == PCI_CHIP_ICELAKE_11_4 || \ | |
| 562 | - (devid) == PCI_CHIP_ICELAKE_11_5 || \ | |
| 563 | - (devid) == PCI_CHIP_ICELAKE_11_6 || \ | |
| 564 | - (devid) == PCI_CHIP_ICELAKE_11_7 || \ | |
| 565 | - (devid) == PCI_CHIP_ICELAKE_11_8) | |
| 566 | - | |
| 567 | -#define IS_ICELAKE(devid) (IS_ICELAKE_11(devid)) | |
| 568 | - | |
| 569 | -#define IS_GEN11(devid) (IS_ICELAKE_11(devid)) | |
| 570 | - | |
| 571 | 547 | /* New platforms use kernel pci ids */ |
| 572 | 548 | #include <stdbool.h> |
| 573 | 549 | |
| 574 | 550 | bool intel_is_genx(unsigned int devid, int gen); |
| 575 | 551 | bool intel_get_genx(unsigned int devid, int *gen); |
| 576 | 552 | |
| 553 | +#define IS_GEN11(devid) intel_is_genx(devid, 11) | |
| 554 | + | |
| 577 | 555 | #define IS_9XX(dev) (IS_GEN3(dev) || \ |
| 578 | 556 | IS_GEN4(dev) || \ |
| 579 | 557 | IS_GEN5(dev) || \ |
| @@ -582,7 +560,6 @@ bool intel_get_genx(unsigned int devid, int *gen); | ||
| 582 | 560 | IS_GEN8(dev) || \ |
| 583 | 561 | IS_GEN9(dev) || \ |
| 584 | 562 | IS_GEN10(dev) || \ |
| 585 | - IS_GEN11(dev) || \ | |
| 586 | 563 | intel_get_genx(dev, NULL)) |
| 587 | 564 | |
| 588 | 565 | #endif /* _INTEL_CHIPSET_H */ |
Android-x86
Fork