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

Petri Latvala petri.latvala at intel.com
Tue Oct 13 06:12:02 UTC 2020


On Tue, Oct 13, 2020 at 09:09:49AM +0300, Petri Latvala wrote:
> On Mon, Oct 12, 2020 at 09:08:28PM +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.
> > 
> > v2: Made test name consistent (Matt)
> > v3: Changed test names in fastfeedback (Petri)
> > 
> > Suggested-by: Matt Roper <matthew.d.roper at intel.com>
> > Signed-off-by: Swati Sharma <swati2.sharma at intel.com>
> > Acked-by: Matt Roper <matthew.d.roper at intel.com>
> 
> Reviewed-by: Petri Latvala <petri.latvala at intel.com>

And merged now.

-- 
Petri Latvala



> 
> 
> 
> > ---
> >  tests/intel-ci/fast-feedback.testlist | 14 +++++++-------
> >  tests/kms_addfb_basic.c               | 14 +++++++-------
> >  2 files changed, 14 insertions(+), 14 deletions(-)
> > 
> > diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
> > index aa2eb329..c074c443 100644
> > --- a/tests/intel-ci/fast-feedback.testlist
> > +++ b/tests/intel-ci/fast-feedback.testlist
> > @@ -48,11 +48,11 @@ igt at i915_hangman@error-state-basic
> >  igt at kms_addfb_basic@addfb25-bad-modifier
> >  igt at kms_addfb_basic@addfb25-framebuffer-vs-set-tiling
> >  igt at kms_addfb_basic@addfb25-modifier-no-flag
> > -igt at kms_addfb_basic@addfb25-x-tiled
> > -igt at kms_addfb_basic@addfb25-x-tiled-mismatch
> > -igt at kms_addfb_basic@addfb25-yf-tiled
> > -igt at kms_addfb_basic@addfb25-y-tiled
> > -igt at kms_addfb_basic@addfb25-y-tiled-small
> > +igt at kms_addfb_basic@addfb25-x-tiled-legacy
> > +igt at kms_addfb_basic@addfb25-x-tiled-mismatch-legacy
> > +igt at kms_addfb_basic@addfb25-yf-tiled-legacy
> > +igt at kms_addfb_basic@addfb25-y-tiled-legacy
> > +igt at kms_addfb_basic@addfb25-y-tiled-small-legacy
> >  igt at kms_addfb_basic@bad-pitch-0
> >  igt at kms_addfb_basic@bad-pitch-1024
> >  igt at kms_addfb_basic@bad-pitch-128
> > @@ -62,8 +62,8 @@ igt at kms_addfb_basic@bad-pitch-63
> >  igt at kms_addfb_basic@bad-pitch-65536
> >  igt at kms_addfb_basic@bad-pitch-999
> >  igt at kms_addfb_basic@basic
> > -igt at kms_addfb_basic@basic-x-tiled
> > -igt at kms_addfb_basic@basic-y-tiled
> > +igt at kms_addfb_basic@basic-x-tiled-legacy
> > +igt at kms_addfb_basic@basic-y-tiled-legacy
> >  igt at kms_addfb_basic@bo-too-small
> >  igt at kms_addfb_basic@bo-too-small-due-to-tiling
> >  igt at kms_addfb_basic@clobberred-modifier
> > diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c
> > index 666e7165..9455909c 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-mismatch-legacy") {
> >  			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
> > 
> _______________________________________________
> igt-dev mailing list
> igt-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev


More information about the igt-dev mailing list