Skip to contentSkip to conversation

core_getversion: Only verify major version for i915.

PATCH In review [email protected] 3 participants 5 messages Apr 20, 2016 – Apr 25, 2016

lore
Share & tools
lore
#0 lore raw

v2 cover core_getversion: Only verify major version for i915.

From: Robert Foss <[email protected]>

This series enables tests/core_getversion to test vc4. It's been tested on rpi2 hardware and kernel 4.6.0-rc1.

Changes since v1:
- Improved commit message
- Switched to is_915_device() helper function

Robert Foss (2):
core_getversion: Switched from igt_assert to assert helpers.
core_getversion: Only verify major version for i915.

 tests/core_getversion.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
Signature · 6 lines
2.5.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH v2 1/2 core_getversion: Switched from igt_assert to assert helpers.

From: Robert Foss <[email protected]>

Switched to assert helpers to enable better error output.

---
 tests/core_getversion.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
tests/core_getversion.c +4 -4
index 5830068..b336e9f 100644
@@ -39,10 +39,10 @@ igt_simple_main
 
 	fd = drm_open_driver(DRIVER_ANY);
 	v = drmGetVersion(fd);
-	igt_assert(strlen(v->name) != 0);
-	igt_assert(strlen(v->date) != 0);
-	igt_assert(strlen(v->desc) != 0);
-	igt_assert(v->version_major >= 1);
+	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);
 	drmFree(v);
 	close(fd);
 }
Signature · 6 lines
2.5.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH v2 2/2 core_getversion: Only verify major version for i915.

In reply to [email protected]

From: Robert Foss <[email protected]>

This change mirrors the change in drm made by [email protected] 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.

---
 tests/core_getversion.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tests/core_getversion.c +3 -1
index b336e9f..f6b0126 100644
@@ -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);
 }
Signature · 6 lines
2.5.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw
In reply to [email protected]
Quoted 4 lines · On Wed, Apr 20, 2016 at 12:25:50PM -0400, [email protected] wrote:

From: Robert Foss <[email protected]>

This series enables tests/core_getversion to test vc4. It's been tested on rpi2 hardware and kernel 4.6.0-rc1.

Ack on both from my side.
-Daniel

Quoted 15 lines

Changes since v1:
- Improved commit message
- Switched to is_915_device() helper function

Robert Foss (2):
core_getversion: Switched from igt_assert to assert helpers.
core_getversion: Only verify major version for i915.

 tests/core_getversion.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
Signature · 1 line
2.5.0
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw
Quoted 7 lines · Daniel Vetter
Quoted 4 lines · On Wed, Apr 20, 2016 at 12:25:50PM -0400, [email protected] wrote:

From: Robert Foss <[email protected]>

This series enables tests/core_getversion to test vc4. It's been tested on rpi2 hardware and kernel 4.6.0-rc1.

Ack on both from my side.

Pushed them both, but I changed the major version check to lte so behavior isn't changed on i915.

Regards,

Tomeu

Quoted 18 lines

-Daniel

Quoted 9 lines

Changes since v1:
- Improved commit message
- Switched to is_915_device() helper function

Robert Foss (2):
core_getversion: Switched from igt_assert to assert helpers.
core_getversion: Only verify major version for i915.

Quoted 6 lines
 tests/core_getversion.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

--
2.5.0

Quoted 8 lines

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx