diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-06-29 11:06:09 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-06-30 23:06:51 +0100 |
| commit | 755fc0c8c3961fd22eff28e368f115101e9dab1d (patch) | |
| tree | dd9d5b08817a846e9b108f41578aae5c912c8357 /lib/intel_chipset.h | |
| parent | 37eec6dae6de794ed318c9f7ab615848d8b10820 (diff) | |
intel_chipset: Convert IS_915, IS_945 to device info
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib/intel_chipset.h')
| -rw-r--r-- | lib/intel_chipset.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h index a40a8572..9806f2f5 100644 --- a/lib/intel_chipset.h +++ b/lib/intel_chipset.h @@ -276,18 +276,6 @@ void intel_check_pch(void); #define IS_GM45(devid) ((devid) == PCI_CHIP_GM45_GM) #define IS_G4X(devid) (IS_G45(devid) || IS_GM45(devid)) -#define IS_915(devid) ((devid) == PCI_CHIP_I915_G || \ - (devid) == PCI_CHIP_E7221_G || \ - (devid) == PCI_CHIP_I915_GM) - -#define IS_945GM(devid) ((devid) == PCI_CHIP_I945_GM || \ - (devid) == PCI_CHIP_I945_GME) - -#define IS_945(devid) ((devid) == PCI_CHIP_I945_G || \ - (devid) == PCI_CHIP_I945_GM || \ - (devid) == PCI_CHIP_I945_GME || \ - IS_G33(devid)) - #define IS_HSW_GT1(devid) ((devid) == PCI_CHIP_HASWELL_GT1 || \ (devid) == PCI_CHIP_HASWELL_M_GT1 || \ (devid) == PCI_CHIP_HASWELL_S_GT1 || \ @@ -396,6 +384,18 @@ void intel_check_pch(void); #define IS_KBL_GT4(devid) ((devid) == PCI_CHIP_KABYLAKE_HALO_GT4) +#define IS_915G(devid) (intel_device_info(devid)->is_grantsdale) +#define IS_915GM(devid) (intel_device_info(devid)->is_alviso) + +#define IS_915(devid) (IS_915G(devid) || IS_915GM(devid)) + +#define IS_945G(devid) (intel_device_info(devid)->is_lakeport) +#define IS_945GM(devid) (intel_device_info(devid)->is_calistoga) + +#define IS_945(devid) (IS_945G(devid) || \ + IS_945GM(devid) || \ + IS_G33(devid)) + #define IS_PINEVIEW(devid) (intel_device_info(devid)->is_pineview) #define IS_G33(devid) (intel_device_info(devid)->is_bearlake || \ intel_device_info(devid)->is_pineview) |