[Intel-gfx] [PATCH igt 11/17] intel_chipset: Convert IS_IRONALKE to device info

Chris Wilson chris at chris-wilson.co.uk
Wed Jun 29 11:39:01 UTC 2016


Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
 lib/intel_chipset.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h
index 1c167f0..f516d8e 100644
--- a/lib/intel_chipset.h
+++ b/lib/intel_chipset.h
@@ -299,13 +299,6 @@ void intel_check_pch(void);
 				 (devid) == PCI_CHIP_Q33_G || \
 				 (devid) == PCI_CHIP_Q35_G || IS_IGD(devid))
 
-#define IS_IVYBRIDGE(devid)	((devid) == PCI_CHIP_IVYBRIDGE_GT1 || \
-				 (devid) == PCI_CHIP_IVYBRIDGE_GT2 || \
-				 (devid) == PCI_CHIP_IVYBRIDGE_M_GT1 || \
-				 (devid) == PCI_CHIP_IVYBRIDGE_M_GT2 || \
-				 (devid) == PCI_CHIP_IVYBRIDGE_S || \
-				 (devid) == PCI_CHIP_IVYBRIDGE_S_GT2)
-
 #define IS_HSW_GT1(devid)	((devid) == PCI_CHIP_HASWELL_GT1 || \
 				 (devid) == PCI_CHIP_HASWELL_M_GT1 || \
 				 (devid) == PCI_CHIP_HASWELL_S_GT1 || \
@@ -414,6 +407,7 @@ void intel_check_pch(void);
 
 #define IS_KBL_GT4(devid)	((devid) == PCI_CHIP_KABYLAKE_HALO_GT4)
 
+#define IS_IVYBRIDGE(devid)	(intel_device_info(devid)->is_ivybridge)
 #define IS_VALLEYVIEW(devid)	(intel_device_info(devid)->is_valleyview)
 #define IS_HASWELL(devid)	(intel_device_info(devid)->is_haswell)
 #define IS_BROADWELL(devid)	(intel_device_info(devid)->is_broadwell)
-- 
2.8.1



More information about the Intel-gfx mailing list