[igt-dev] [PATCH i-g-t] lib: Remove early has_known_intel_chipset() check

* [igt-dev] [PATCH i-g-t] lib: Remove early has_known_intel_chipset() check
@ 2020-05-19 13:44 Chris Wilson
  2020-05-19 13:50 ` Mika Kuoppala
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Chris Wilson @ 2020-05-19 13:44 UTC (permalink / raw)
  To: igt-dev; +Cc: Chris Wilson

When opening a specific driver, open that driver. Once we have the
device fd, we can then do feature checks that the tests *actually*
require.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 lib/drmtest.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/lib/drmtest.c b/lib/drmtest.c
index 040ca39c2..70fd64c95 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -118,24 +118,6 @@ bool is_vc4_device(int fd)
 	return __is_device(fd, "vc4");
 }
 
-static bool has_known_intel_chipset(int fd)
-{
-	struct drm_i915_getparam gp;
-	int devid = 0;
-
-	memset(&gp, 0, sizeof(gp));
-	gp.param = I915_PARAM_CHIPSET_ID;
-	gp.value = &devid;
-
-	if (ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp)))
-		return false;
-
-	if (!intel_gen(devid))
-		return false;
-
-	return true;
-}
-
 static char _forced_driver[16] = "";
 
 /**
@@ -636,7 +618,7 @@ void igt_require_amdgpu(int fd)
 
 void igt_require_intel(int fd)
 {
-	igt_require(is_i915_device(fd) && has_known_intel_chipset(fd));
+	igt_require(is_i915_device(fd));
 }
 
 void igt_require_vc4(int fd)
-- 
2.26.2

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 5+ messages in thread