[PATCH i-g-t v3 5/9] XE3: tests/kms_addfb_basic: fix x-tiled tests for case when there is no x-tile

[Juha-Pekka Heikkilä]

Hi,

To be honest this is minor issue to me. Originally Intel IT tools set
my name as is seen on the original s-o-b and in the past years I
didn't care enough as changing that from default. I don't think anyone
mistakes me for someone else in any of these ways of spelling my name
but changing it for this patch will cause s-o-b not to match any of
the previous if someone need to go grepping it.

/Juha-Pekka

On Sat, Nov 16, 2024 at 1:42 AM Taylor, Clinton A
<clinton.a.taylor at intel.com> wrote:
>
> On Fri, 2024-11-15 at 14:31 +0100, Kamil Konieczny wrote:
> > Hi Clint,
> > On 2024-11-14 at 11:03:35 -0800, Clint Taylor wrote:
> > > From: "Heikkila, Juha-pekka" <juha-pekka.heikkila at intel.com>
> >
> > Please use correct names here, it should be:
> >
> > > From: "Juha-pekka Heikkila" <juha-pekka.heikkila at intel.com>
> > > On Xe3 display no more support x-tile and will disable such framebuffers
> > >
> > > Signed-off-by: Heikkila, Juha-pekka <juha-pekka.heikkila at intel.com>
> >
> > and here:
> >
> > Signed-off-by: Juha-pekka Heikkila <juha-pekka.heikkila at intel.com>
> >
> > Please do the same corrections in other patches in this series.
> >
>   I will ask JP if it's ok to change the original SOB and Author lines. They were
> originally committed this way.
>
>
> -Clint
>
> > Regards,
> > Kamil
> >
> > > Signed-off-by: Clint Taylor <Clinton.A.Taylor at intel.com>
> > > ---
> > >  tests/kms_addfb_basic.c | 22 ++++++++++++----------
> > >  1 file changed, 12 insertions(+), 10 deletions(-)
> > >
> > > diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c
> > > index b22818592..3ba87117b 100644
> > > --- a/tests/kms_addfb_basic.c
> > > +++ b/tests/kms_addfb_basic.c
> > > @@ -217,6 +217,12 @@ static int legacy_addfb(int fd, struct drm_mode_fb_cmd *arg)
> > >     return err;
> > >  }
> > >
> > > +static int addfb_expected_ret(igt_display_t *disp, struct drm_mode_fb_cmd2 *f)
> > > +{
> > > +   return igt_display_has_format_mod(disp, f->pixel_format,
> > > +                                     f->modifier[0]) ? 0 : -1;
> > > +}
> > > +
> > >  static void invalid_tests(int fd)
> > >  {
> > >     struct drm_mode_fb_cmd2 f = {};
> > > @@ -735,8 +741,10 @@ static void addfb25_tests(int fd)
> > >             igt_describe("Check if addfb2 call works for x-tiling");
> > >             igt_subtest("addfb25-x-tiled-legacy") {
> > >                     f.modifier[0] = I915_FORMAT_MOD_X_TILED;
> > > -                   do_ioctl(fd, DRM_IOCTL_MODE_ADDFB2, &f);
> > > -                   do_ioctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id);
> > > +                   igt_assert_eq(drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f),
> > > +                                 addfb_expected_ret(&display, &f));
> > > +                   if (!addfb_expected_ret(&display, &f))
> > > +                           do_ioctl(fd, DRM_IOCTL_MODE_RMFB, &f.fb_id);
> > >                     f.fb_id = 0;
> > >             }
> > >
> > > @@ -756,12 +764,6 @@ static void addfb25_tests(int fd)
> > >             gem_close(fd, gem_bo);
> > >  }
> > >
> > > -static int addfb_expected_ret(igt_display_t *disp, struct drm_mode_fb_cmd2 *f)
> > > -{
> > > -   return igt_display_has_format_mod(disp, f->pixel_format,
> > > -                                     f->modifier[0]) ? 0 : -1;
> > > -}
> > > -
> > >  static void addfb25_ytile(int fd)
> > >  {
> > >     struct drm_mode_fb_cmd2 f = {};
> > > @@ -1012,8 +1014,6 @@ igt_main
> > >
> > >     master_tests(fd);
> > >
> > > -   addfb25_tests(fd);
> > > -
> > >     tiling_tests(fd);
> > >
> > >     igt_subtest_group {
> > > @@ -1025,6 +1025,8 @@ igt_main
> > >             igt_fixture
> > >                     igt_require_intel(fd);
> > >
> > > +           addfb25_tests(fd);
> > > +
> > >             addfb25_ytile(fd);
> > >
> > >             addfb25_4tile(fd);
> > > --
> > > 2.25.1
> > >