[PATCH i-g-t v2 0/2] core_getversion: Only verify major version for i915.

[PATCH i-g-t v2 0/2] core_getversion: Only verify major version for i915.

[robert.foss]

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

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(-)

-- 
2.5.0

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

[PATCH i-g-t v2 1/2] core_getversion: Switched from igt_assert to assert helpers.

[robert.foss]

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

Switched to assert helpers to enable better error output.

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

diff --git a/tests/core_getversion.c b/tests/core_getversion.c
index 5830068..b336e9f 100644
--- a/tests/core_getversion.c
+++ b/tests/core_getversion.c
@@ -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);
 }
-- 
2.5.0

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

[PATCH i-g-t v2 2/2] core_getversion: Only verify major version for i915.

[robert.foss]

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

Re: [PATCH i-g-t v2 0/2] core_getversion: Only verify major version for i915.

[Daniel Vetter]

On Wed, Apr 20, 2016 at 12:25:50PM -0400, robert.foss@collabora.com wrote:
> From: Robert Foss <robert.foss@collabora.com>
> 
> 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

> 
> 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(-)
> 
> -- 
> 2.5.0
> 

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

Re: [PATCH i-g-t v2 0/2] core_getversion: Only verify major version for i915.

[Tomeu Vizoso]

On 21 April 2016 at 11:20, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Wed, Apr 20, 2016 at 12:25:50PM -0400, robert.foss@collabora.com wrote:
>> From: Robert Foss <robert.foss@collabora.com>
>>
>> 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

> -Daniel
>
>>
>> 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(-)
>>
>> --
>> 2.5.0
>>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx