summaryrefslogtreecommitdiff
path: root/lib/intel_chipset.h
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2016-06-29 11:06:09 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2016-06-30 23:06:51 +0100
commit2fc5945776301d8886cd05163aea9514334fa5e0 (patch)
tree1df87ccf5a75854b1170fd9986007659caa666ba /lib/intel_chipset.h
parentf17d633cd483b703d517091d3d567df8705739b6 (diff)
intel_chipset: Convert IS_CHERRYVIEW 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.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h
index 146c650b..c4f64dc0 100644
--- a/lib/intel_chipset.h
+++ b/lib/intel_chipset.h
@@ -385,11 +385,6 @@ void intel_check_pch(void);
(((devid) & 0x000f) == BDW_WORKSTATION) ? 1 : \
(((devid) & 0x000f) == BDW_ULX) ? 1 : 0)
-#define IS_CHERRYVIEW(devid) ((devid) == PCI_CHIP_CHERRYVIEW_0 || \
- (devid) == PCI_CHIP_CHERRYVIEW_1 || \
- (devid) == PCI_CHIP_CHERRYVIEW_2 || \
- (devid) == PCI_CHIP_CHERRYVIEW_3)
-
#define IS_SKL_GT1(devid) ((devid) == PCI_CHIP_SKYLAKE_ULT_GT1 || \
(devid) == PCI_CHIP_SKYLAKE_ULX_GT1 || \
(devid) == PCI_CHIP_SKYLAKE_DT_GT1 || \
@@ -437,11 +432,8 @@ void intel_check_pch(void);
#define IS_KBL_GT4(devid) ((devid) == PCI_CHIP_KABYLAKE_HALO_GT4)
-#define IS_KABYLAKE(devid) (IS_KBL_GT1(devid) || \
- IS_KBL_GT2(devid) || \
- IS_KBL_GT3(devid) || \
- IS_KBL_GT4(devid))
-
+#define IS_CHERRYVIEW(devid) (intel_device_info(devid)->is_cherryview)
+#define IS_KABYLAKE(devid) (intel_device_info(devid)->is_kabylake)
#define IS_SKYLAKE(devid) (intel_device_info(devid)->is_skylake)
#define IS_BROXTON(devid) (intel_device_info(devid)->is_broxton)