diff mbox

[i-g-t,1/2] tests/gem_storedw_loop: skip on gen6 bsd

Message ID 1441271128-12165-1-git-send-email-thomas.wood@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Thomas Wood Sept. 3, 2015, 9:05 a.m. UTC 
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
---
 tests/gem_storedw_loop.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

Comments

Daniel Vetter Sept. 4, 2015, 8:15 a.m. UTC | #1 
On Thu, Sep 03, 2015 at 10:05:27AM +0100, Thomas Wood wrote:
> Signed-off-by: Thomas Wood <thomas.wood@intel.com>

Bit more commit message would be good, just copypaste the debug output ;-)
lgtm otherwise on the patch series.
-Daniel

> ---
>  tests/gem_storedw_loop.c | 13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/gem_storedw_loop.c b/tests/gem_storedw_loop.c
> index 2263397..1bb276e 100644
> --- a/tests/gem_storedw_loop.c
> +++ b/tests/gem_storedw_loop.c
> @@ -144,6 +144,14 @@ struct ring {
>  	{ "vebox", I915_EXEC_VEBOX },
>  };
>  
> +static void
> +check_test_requirements(int fd, int ringid)
> +{
> +	gem_require_ring(fd, ringid);
> +	igt_skip_on_f(intel_gen(devid) == 6 && ringid == I915_EXEC_BSD,
> +		      "MI_STORE_DATA broken on gen6 bsd\n");
> +}
> +
>  igt_main
>  {
>  	int fd, i;
> @@ -166,13 +174,14 @@ igt_main
>  	}
>  
>  	for (i = 0; i < ARRAY_SIZE(rings); i++) {
> +
>  		igt_subtest_f("basic-%s", rings[i].name) {
> -			gem_require_ring(fd, rings[i].id);
> +			check_test_requirements(fd, rings[i].id);
>  			store_test(rings[i].id, 16*1024);
>  		}
>  
>  		igt_subtest_f("long-%s", rings[i].name) {
> -			gem_require_ring(fd, rings[i].id);
> +			check_test_requirements(fd, rings[i].id);
>  			store_test(rings[i].id, 1024*1024);
>  		}
>  	}
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/tests/gem_storedw_loop.c b/tests/gem_storedw_loop.c
index 2263397..1bb276e 100644
--- a/tests/gem_storedw_loop.c
+++ b/tests/gem_storedw_loop.c
@@ -144,6 +144,14 @@  struct ring {
 	{ "vebox", I915_EXEC_VEBOX },
 };
 
+static void
+check_test_requirements(int fd, int ringid)
+{
+	gem_require_ring(fd, ringid);
+	igt_skip_on_f(intel_gen(devid) == 6 && ringid == I915_EXEC_BSD,
+		      "MI_STORE_DATA broken on gen6 bsd\n");
+}
+
 igt_main
 {
 	int fd, i;
@@ -166,13 +174,14 @@  igt_main
 	}
 
 	for (i = 0; i < ARRAY_SIZE(rings); i++) {
+
 		igt_subtest_f("basic-%s", rings[i].name) {
-			gem_require_ring(fd, rings[i].id);
+			check_test_requirements(fd, rings[i].id);
 			store_test(rings[i].id, 16*1024);
 		}
 
 		igt_subtest_f("long-%s", rings[i].name) {
-			gem_require_ring(fd, rings[i].id);
+			check_test_requirements(fd, rings[i].id);
 			store_test(rings[i].id, 1024*1024);
 		}
 	}