[igt-dev] [PATCH i-g-t] tests/kms_addfb_basic: Require an intel card for tests using tiling

[igt-dev] [PATCH i-g-t] tests/kms_addfb_basic: Require an intel card for tests using tiling

[Mihail Atanassov]

Not skipping the affected tests causes all the rest to fail on
non-Intel drivers.

Signed-off-by: Mihail Atanassov <mihail.atanassov@arm.com>
---
 tests/kms_addfb_basic.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c
index 20dfd4f2..666e7165 100644
--- a/tests/kms_addfb_basic.c
+++ b/tests/kms_addfb_basic.c
@@ -131,6 +131,7 @@ static void invalid_tests(int fd)
 	}
 
 	igt_subtest("clobberred-modifier") {
+		igt_require_intel(fd);
 		f.flags = 0;
 		f.modifier[0] = 0;
 		gem_set_tiling(fd, gem_bo, I915_TILING_X, 512*4);
@@ -302,6 +303,7 @@ static void tiling_tests(int fd)
 
 	igt_subtest_group {
 		igt_fixture {
+			igt_require_intel(fd);
 			tiled_x_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
 				DRM_FORMAT_XRGB8888, LOCAL_I915_FORMAT_MOD_X_TILED,
 				1024*4, NULL, NULL, NULL);
@@ -447,6 +449,7 @@ static void size_tests(int fd)
 	}
 
 	igt_subtest("bo-too-small-due-to-tiling") {
+		igt_require_intel(fd);
 		gem_set_tiling(fd, gem_bo_small, I915_TILING_X, 1024*4);
 		igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 &&
 			   errno == EINVAL);
@@ -498,6 +501,7 @@ static void addfb25_tests(int fd)
 
 	igt_subtest_group {
 		igt_fixture {
+			igt_require_intel(fd);
 			gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4);
 			igt_require_fb_modifiers(fd);
 		}
-- 
2.22.0

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

Re: [igt-dev] [PATCH i-g-t] tests/kms_addfb_basic: Require an intel card for tests using tiling

[Ser, Simon]

On Tue, 2019-07-23 at 14:22 +0000, Mihail Atanassov wrote:
> Not skipping the affected tests causes all the rest to fail on
> non-Intel drivers.
> 
> Signed-off-by: Mihail Atanassov <mihail.atanassov@arm.com>

LGTM

Reviewed-by: Simon Ser <simon.ser@intel.com>

And pushed:

To gitlab.freedesktop.org:drm/igt-gpu-tools.git
   1a5b48671e08..ab5871ca3a20  master -> master

Thanks!

> ---
>  tests/kms_addfb_basic.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c
> index 20dfd4f2..666e7165 100644
> --- a/tests/kms_addfb_basic.c
> +++ b/tests/kms_addfb_basic.c
> @@ -131,6 +131,7 @@ static void invalid_tests(int fd)
>  	}
>  
>  	igt_subtest("clobberred-modifier") {
> +		igt_require_intel(fd);
>  		f.flags = 0;
>  		f.modifier[0] = 0;
>  		gem_set_tiling(fd, gem_bo, I915_TILING_X, 512*4);
> @@ -302,6 +303,7 @@ static void tiling_tests(int fd)
>  
>  	igt_subtest_group {
>  		igt_fixture {
> +			igt_require_intel(fd);
>  			tiled_x_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
>  				DRM_FORMAT_XRGB8888, LOCAL_I915_FORMAT_MOD_X_TILED,
>  				1024*4, NULL, NULL, NULL);
> @@ -447,6 +449,7 @@ static void size_tests(int fd)
>  	}
>  
>  	igt_subtest("bo-too-small-due-to-tiling") {
> +		igt_require_intel(fd);
>  		gem_set_tiling(fd, gem_bo_small, I915_TILING_X, 1024*4);
>  		igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 &&
>  			   errno == EINVAL);
> @@ -498,6 +501,7 @@ static void addfb25_tests(int fd)
>  
>  	igt_subtest_group {
>  		igt_fixture {
> +			igt_require_intel(fd);
>  			gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4);
>  			igt_require_fb_modifiers(fd);
>  		}
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✗ Fi.CI.BAT: failure for tests/kms_addfb_basic: Require an intel card for tests using tiling

[Patchwork]

== Series Details ==

Series: tests/kms_addfb_basic: Require an intel card for tests using tiling
URL   : https://patchwork.freedesktop.org/series/64093/
State : failure

== Summary ==

Series 64093 revision 1 was fully merged or fully failed: no git log

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

Re: [igt-dev] ✗ Fi.CI.BAT: failure for tests/kms_addfb_basic: Require an intel card for tests using tiling

[Ser, Simon]

On Tue, 2019-07-23 at 14:59 +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: tests/kms_addfb_basic: Require an intel card for tests using tiling
> URL   : https://patchwork.freedesktop.org/series/64093/
> State : failure
> 
> == Summary ==
> 
> Series 64093 revision 1 was fully merged or fully failed: no git log

Bleh, sorry about that. Still not used to "wait for the e-mail to come
before merging" thing it seems.

Anyway, I believe no harm has been caused, and I tested the change
locally before pushing.

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