public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: robert.foss@collabora.com
To: daniel@ffwll.ch
Cc: intel-gfx@lists.freedesktop.org
Subject: [PATCH i-g-t v2 2/2] core_getversion: Only verify major version for i915.
Date: Wed, 20 Apr 2016 12:25:52 -0400	[thread overview]
Message-ID: <1461169552-14159-3-git-send-email-robert.foss@collabora.com> (raw)
In-Reply-To: <1461169552-14159-1-git-send-email-robert.foss@collabora.com>

From: Robert Foss <robert.foss@collabora.com>

This change mirrors the change in drm made by krh@redhat.com
on "Mon Apr 6 17:18:17 2009" on the drm branch intel_on_all_hw.

The assert(major < 1) is only needed for the legacy intel driver.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
 tests/core_getversion.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/core_getversion.c b/tests/core_getversion.c
index b336e9f..f6b0126 100644
--- a/tests/core_getversion.c
+++ b/tests/core_getversion.c
@@ -42,7 +42,9 @@ igt_simple_main
 	igt_assert_neq(strlen(v->name), 0);
 	igt_assert_neq(strlen(v->date), 0);
 	igt_assert_neq(strlen(v->desc), 0);
-	igt_assert_lt(1, v->version_major);
+	if (is_i915_device(fd))
+		igt_assert_lt(1, v->version_major);
+
 	drmFree(v);
 	close(fd);
 }
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2016-04-20 16:25 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-20 16:25 [PATCH i-g-t v2 0/2] core_getversion: Only verify major version for i915 robert.foss
2016-04-20 16:25 ` [PATCH i-g-t v2 1/2] core_getversion: Switched from igt_assert to assert helpers robert.foss
2016-04-20 16:25 ` robert.foss [this message]
2016-04-21  9:20 ` [PATCH i-g-t v2 0/2] core_getversion: Only verify major version for i915 Daniel Vetter
2016-04-25 13:30   ` Tomeu Vizoso

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=1461169552-14159-3-git-send-email-robert.foss@collabora.com \
    --to=robert.foss@collabora.com \
    --cc=daniel@ffwll.ch \
    --cc=intel-gfx@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