[PATCH i-g-t 5/6] igt: Get rid of AT_LEAST_DISPLAY()

[Ville Syrjala <ville.syrjala@linux.intel.com>]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

AT_LEAST_DISPLAY() looks completely pointless. Just
compare numbers naturally.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 lib/intel_chipset.h     | 1 -
 tests/intel/kms_pm_dc.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h
index 270392c83c2a..85c075a4ad8b 100644
--- a/lib/intel_chipset.h
+++ b/lib/intel_chipset.h
@@ -210,7 +210,6 @@ void intel_check_pch(void);
 
 #define IS_GEN(devid, x)	(intel_get_device_info(devid)->graphics_ver == x)
 #define AT_LEAST_GEN(devid, x)	(intel_get_device_info(devid)->graphics_ver >= x)
-#define AT_LEAST_DISPLAY(devid, x) (intel_get_device_info(devid)->display_ver >= x)
 
 #define IS_GEN2(devid)		IS_GEN(devid, 2)
 #define IS_GEN3(devid)		IS_GEN(devid, 3)
diff --git a/tests/intel/kms_pm_dc.c b/tests/intel/kms_pm_dc.c
index c87e1d4084fb..541e94cb5b05 100644
--- a/tests/intel/kms_pm_dc.c
+++ b/tests/intel/kms_pm_dc.c
@@ -92,7 +92,7 @@
 #define KMS_HELPER "/sys/module/drm_kms_helper/parameters/"
 #define PACKAGE_CSTATE_PATH  "pmc_core/package_cstate_show"
 #define KMS_POLL_DISABLE 0
-#define DC9_RESETS_DC_COUNTERS(devid) (!(IS_DG1(devid) || IS_DG2(devid) || AT_LEAST_DISPLAY(devid, 14)))
+#define DC9_RESETS_DC_COUNTERS(devid) (!(IS_DG1(devid) || IS_DG2(devid) || intel_display_ver(devid) >= 14))
 #define SEC 1
 #define MSEC (SEC * 1000)
 
-- 
2.44.2