Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Chris Wilson <chris@chris-wilson.co.uk>
To: igt-dev@lists.freedesktop.org
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [igt-dev] [PATCH i-g-t] lib: Remove early has_known_intel_chipset() check
Date: Tue, 19 May 2020 14:44:05 +0100	[thread overview]
Message-ID: <20200519134405.1876899-1-chris@chris-wilson.co.uk> (raw)

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

             reply	other threads:[~2020-05-19 13:44 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-19 13:44 Chris Wilson [this message]
2020-05-19 13:50 ` [igt-dev] [PATCH i-g-t] lib: Remove early has_known_intel_chipset() check Mika Kuoppala
2020-05-19 13:52 ` Petri Latvala
2020-05-19 16:38 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2020-05-20  0:46 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200519134405.1876899-1-chris@chris-wilson.co.uk \
    --to=chris@chris-wilson.co.uk \
    --cc=igt-dev@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox