Re: [igt-dev] [PATCH 08/10] tests/fb/tgl: Yf tiling does not exist on gen-12

Ville Syrjälä
2019-07-19T12:27:32Z

On Mon, Jul 15, 2019 at 02:51:34PM -0700, Lucas De Marchi wrote:
> From: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
>
> Fix test to check for addfb failure instead.
>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

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

> ---
> tests/kms_addfb_basic.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c
> index d5dc3eff..20dfd4f2 100644
> --- a/tests/kms_addfb_basic.c
> +++ b/tests/kms_addfb_basic.c
> @@ -527,7 +527,7 @@ static void addfb25_tests(int fd)
> gem_close(fd, gem_bo);
> }
>
> -static int addfb_expected_ret(int fd)
> +static int addfb_expected_ret(int fd, uint64_t modifier)
> {
> int gen;
>
> @@ -535,6 +535,9 @@ static int addfb_expected_ret(int fd)
> return 0;
>
> gen = intel_gen(intel_get_drm_devid(fd));
> +
> + if (modifier == LOCAL_I915_FORMAT_MOD_Yf_TILED)
> + return gen >= 9 && gen < 12 ? 0 : -1;
> return gen >= 9 ? 0 : -1;
> }
>
> @@ -568,8 +571,8 @@ static void addfb25_ytile(int fd)
>
> f.modifier[0] = LOCAL_I915_FORMAT_MOD_Y_TILED;
> igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) ==
> - addfb_expected_ret(fd));
> - if (!addfb_expected_ret(fd))
> + addfb_expected_ret(fd, f.modifier[0]));
> + if (!addfb_expected_ret(fd, f.modifier[0]))
> igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0);
> f.fb_id = 0;
> }
> @@ -579,8 +582,8 @@ static void addfb25_ytile(int fd)
>
> f.modifier[0] = LOCAL_I915_FORMAT_MOD_Yf_TILED;
> igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) ==
> - addfb_expected_ret(fd));
> - if (!addfb_expected_ret(fd))
> + addfb_expected_ret(fd, f.modifier[0]));
> + if (!addfb_expected_ret(fd, f.modifier[0]))
> igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0);
> f.fb_id = 0;
> }
> --
> 2.21.0

--
Ville Syrjälä
Intel