[PATCH i-g-t] i915/gem_tiling_max_stride: Skip if chipset is unknown

[PATCH i-g-t] i915/gem_tiling_max_stride: Skip if chipset is unknown

[Chris Wilson]

If we can't match the devid to a chipset, we do not have a reference for
the tiling strides. Instead of randomly failing, skip with a
semi-informative message.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110523
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 tests/i915/gem_tiling_max_stride.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/tests/i915/gem_tiling_max_stride.c b/tests/i915/gem_tiling_max_stride.c
index a6f97a915..0e99d979f 100644
--- a/tests/i915/gem_tiling_max_stride.c
+++ b/tests/i915/gem_tiling_max_stride.c
@@ -72,16 +72,18 @@ igt_simple_main
 
 	devid = intel_get_drm_devid(fd);
 
-	if (intel_gen(devid) >= 7)
+	if (intel_gen(devid) >= 7) {
 		stride = 256 * 1024;
-	else if (intel_gen(devid) >= 4)
+	} else if (intel_gen(devid) >= 4) {
 		stride = 128 * 1024;
-	else {
-		if (IS_GEN2(devid)) {
-			tile_width = 128;
-			tile_height = 16;
-		}
+	} else if (intel_gen(devid) >= 3) {
+		stride = 8 * 1024;
+	} else if (intel_gen(devid) >= 2) {
+		tile_width = 128;
+		tile_height = 16;
 		stride = 8 * 1024;
+	} else {
+		igt_skip("Unknown Intel chipset, devid=%04x\n", devid);
 	}
 
 	size = stride * tile_height;
-- 
2.20.1

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

Re: [igt-dev] [PATCH i-g-t] i915/gem_tiling_max_stride: Skip if chipset is unknown

[Ville Syrjälä]

On Fri, Apr 26, 2019 at 08:56:45AM +0100, Chris Wilson wrote:
> If we can't match the devid to a chipset, we do not have a reference for
> the tiling strides. Instead of randomly failing, skip with a
> semi-informative message.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110523
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  tests/i915/gem_tiling_max_stride.c | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
> 
> diff --git a/tests/i915/gem_tiling_max_stride.c b/tests/i915/gem_tiling_max_stride.c
> index a6f97a915..0e99d979f 100644
> --- a/tests/i915/gem_tiling_max_stride.c
> +++ b/tests/i915/gem_tiling_max_stride.c
> @@ -72,16 +72,18 @@ igt_simple_main
>  
>  	devid = intel_get_drm_devid(fd);
>  
> -	if (intel_gen(devid) >= 7)
> +	if (intel_gen(devid) >= 7) {
>  		stride = 256 * 1024;
> -	else if (intel_gen(devid) >= 4)
> +	} else if (intel_gen(devid) >= 4) {
>  		stride = 128 * 1024;
> -	else {
> -		if (IS_GEN2(devid)) {
> -			tile_width = 128;
> -			tile_height = 16;
> -		}
> +	} else if (intel_gen(devid) >= 3) {
> +		stride = 8 * 1024;
> +	} else if (intel_gen(devid) >= 2) {
> +		tile_width = 128;
> +		tile_height = 16;
>  		stride = 8 * 1024;
> +	} else {
> +		igt_skip("Unknown Intel chipset, devid=%04x\n", devid);
>  	}
>  
>  	size = stride * tile_height;
> -- 
> 2.20.1
> 
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev

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