[igt-dev] [PATCH i-g-t] tests/kms_addfb_basic: Renaming tests as legacy tiling

[Matt Roper]

On Mon, Sep 28, 2020 at 08:36:14PM +0530, Swati Sharma wrote:
> Tests require legacy get_tiling/set_tiling API's. Renaming the subtest
> names to make it obvious that these are legacy-only tests.
> 
> Suggested-by: Matt Roper <matthew.d.roper at intel.com>
> Signed-off-by: Swati Sharma <swati2.sharma at intel.com>
> ---
>  tests/kms_addfb_basic.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c
> index 666e7165..3230d603 100644
> --- a/tests/kms_addfb_basic.c
> +++ b/tests/kms_addfb_basic.c
> @@ -320,7 +320,7 @@ static void tiling_tests(int fd)
>  		}
>  
>  		f.pitches[0] = 1024*4;
> -		igt_subtest("basic-X-tiled") {
> +		igt_subtest("basic-x-tiled-legacy") {
>  			f.handles[0] = tiled_x_bo;
>  
>  			igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == 0);
> @@ -348,7 +348,7 @@ static void tiling_tests(int fd)
>  		}
>  
>  		f.pitches[0] = 1024*4;
> -		igt_subtest("basic-Y-tiled") {
> +		igt_subtest("basic-y-tiled-legacy") {
>  			f.handles[0] = tiled_y_bo;
>  
>  			igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f) == -1 &&
> @@ -506,12 +506,12 @@ static void addfb25_tests(int fd)
>  			igt_require_fb_modifiers(fd);
>  		}
>  
> -		igt_subtest("addfb25-X-tiled-mismatch") {
> +		igt_subtest("addfb25-x-tiled-legacy-mismatch") {

You might want to put the "-legacy" at the end of the name here for
consistency with the rest of the subtests since it's the test itself
(which wants to exercise get_tiling/set_tiling) rather than the tiling
type itself that's legacy.  But either way,

Acked-by: Matt Roper <matthew.d.roper at intel.com>

>  			f.modifier[0] = LOCAL_DRM_FORMAT_MOD_NONE;
>  			igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) < 0 && errno == EINVAL);
>  		}
>  
> -		igt_subtest("addfb25-X-tiled") {
> +		igt_subtest("addfb25-x-tiled-legacy") {
>  			f.modifier[0] = LOCAL_I915_FORMAT_MOD_X_TILED;
>  			igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) == 0);
>  			igt_assert(drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id) == 0);
> @@ -570,7 +570,7 @@ static void addfb25_ytile(int fd)
>  		f.handles[0] = gem_bo;
>  	}
>  
> -	igt_subtest("addfb25-Y-tiled") {
> +	igt_subtest("addfb25-y-tiled-legacy") {
>  		igt_require_fb_modifiers(fd);
>  
>  		f.modifier[0] = LOCAL_I915_FORMAT_MOD_Y_TILED;
> @@ -581,7 +581,7 @@ static void addfb25_ytile(int fd)
>  		f.fb_id = 0;
>  	}
>  
> -	igt_subtest("addfb25-Yf-tiled") {
> +	igt_subtest("addfb25-yf-tiled-legacy") {
>  		igt_require_fb_modifiers(fd);
>  
>  		f.modifier[0] = LOCAL_I915_FORMAT_MOD_Yf_TILED;
> @@ -592,7 +592,7 @@ static void addfb25_ytile(int fd)
>  		f.fb_id = 0;
>  	}
>  
> -	igt_subtest("addfb25-Y-tiled-small") {
> +	igt_subtest("addfb25-y-tiled-small-legacy") {
>  		igt_require_fb_modifiers(fd);
>  
>  		gen = intel_gen(intel_get_drm_devid(fd));
> -- 
> 2.25.1
> 

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795