[igt-dev] [PATCH i-g-t 2/3] tests/kms_addfb_basic: Skip tiling subtests on device without hw tiling

[Ville Syrjälä]

On Thu, Aug 19, 2021 at 01:59:41PM +0200, Thomas Hellström wrote:
> From: Vanshidhar Konda <vanshidhar.r.konda at intel.com>
> 
> Skip subtests that are testing interoperability of FB modifiers and
> hardware tiling if the device does not support HW tiling
> 
> Cc: Uma Shankar <uma.shankar at intel.com>
> Signed-off-by: Vanshidhar Konda <vanshidhar.r.konda at intel.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 05c8b5f6..f5a15298 100644
> --- a/tests/kms_addfb_basic.c
> +++ b/tests/kms_addfb_basic.c
> @@ -138,6 +138,7 @@ static void invalid_tests(int fd)
>  	igt_describe("Check if addfb2 call works for clobbered modifier");
>  	igt_subtest("clobberred-modifier") {
>  		igt_require_intel(fd);
> +		igt_require(gem_has_legacy_hw_tiling(fd));
>  		f.flags = 0;
>  		f.modifier[0] = 0;
>  		gem_set_tiling(fd, gem_bo, I915_TILING_X, 512*4);
> @@ -340,6 +341,7 @@ static void tiling_tests(int fd)
>  	igt_subtest_group {
>  		igt_fixture {
>  			igt_require_intel(fd);
> +			igt_require(gem_has_legacy_hw_tiling(fd));
>  			tiled_x_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
>  				DRM_FORMAT_XRGB8888, I915_FORMAT_MOD_X_TILED,
>  				1024*4, NULL, NULL, NULL);

Hmm. These tests look at bit borked atm. There's no explicit
set_tiling() calls in sight, so I guess currently we're just
assuming that igt_fb will do it for us. That seems rather
fragile, and if we were to remove the set_tiling() calls from
igt_fb then these tests would no longer be testing what we think
they are testing...

> @@ -511,6 +513,7 @@ static void size_tests(int fd)
>  	igt_describe("Test that addfb2 call fails correctly with small buffer object after changing tile");
>  	igt_subtest("bo-too-small-due-to-tiling") {
>  		igt_require_intel(fd);
> +		igt_require(gem_has_legacy_hw_tiling(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);
> @@ -565,6 +568,7 @@ static void addfb25_tests(int fd)
>  	igt_subtest_group {
>  		igt_fixture {
>  			igt_require_intel(fd);
> +			igt_require(gem_has_legacy_hw_tiling(fd));
>  			gem_set_tiling(fd, gem_bo, I915_TILING_X, 1024*4);
>  			igt_require_fb_modifiers(fd);
>  		}
> -- 
> 2.31.1

-- 
Ville Syrjälä
Intel