[igt-dev] [PATCH i-g-t] tests/i915_pm_rpm: mmap type based dynamic subtests

[Chris Wilson]

Quoting Ramalingam C (2020-02-17 09:44:42)
> On 2020-02-17 at 15:10:45 +0530, Ramalingam C wrote:
> > Tests for gem_mmap_gtt/cpu are replaced with dynamic subtests with
> > the array of mmap_types passed to gem_mmap_offset.
> > 
> > Signed-off-by: Ramalingam C <ramalingam.c at intel.com>
> > cc: Chris Wilson <chris at chris-wilson.co.uk>
> > ---
> >  tests/i915/i915_pm_rpm.c | 34 ++++++++++++++--------------------
> >  1 file changed, 14 insertions(+), 20 deletions(-)
> > 
> > diff --git a/tests/i915/i915_pm_rpm.c b/tests/i915/i915_pm_rpm.c
> > index 3d7343240802..0c2821122956 100644
> > --- a/tests/i915/i915_pm_rpm.c
> > +++ b/tests/i915/i915_pm_rpm.c
> > @@ -1007,7 +1007,7 @@ static void debugfs_forcewake_user_subtest(void)
> >       igt_assert(wait_for_suspended());
> >  }
> >  
> > -static void gem_mmap_subtest(bool gtt_mmap)
> > +static void gem_mmap_args(const struct mmap_offset *t)
> >  {
> >       int i;
> >       uint32_t handle;
> > @@ -1019,14 +1019,9 @@ static void gem_mmap_subtest(bool gtt_mmap)
> >  
> >       handle = gem_create(drm_fd, buf_size);
> >  
> > -     if (gtt_mmap) {
> > -             gem_buf = gem_mmap__gtt(drm_fd, handle, buf_size,
> > -                                     PROT_READ | PROT_WRITE);
> > -     }
> > -     else {
> > -             gem_buf = gem_mmap__cpu(drm_fd, handle, 0, buf_size, 0);
> > -     }
> > -
> > +     gem_buf = __gem_mmap_offset(drm_fd, handle, 0, buf_size,
> > +                                 PROT_READ | PROT_WRITE, t->type);
> > +     igt_require(gem_buf);
> >  
> >       for (i = 0; i < buf_size; i++)
> >               gem_buf[i] = i & 0xFF;
> > @@ -1056,13 +1051,9 @@ static void gem_mmap_subtest(bool gtt_mmap)
> >        * suspended. */
> >       disable_all_screens_and_wait(&ms_data);
> >  
> > -     if (gtt_mmap) {
> > -             gem_buf = gem_mmap__gtt(drm_fd, handle, buf_size,
> > -                                     PROT_READ | PROT_WRITE);
> > -     }
> > -     else {
> > -             gem_buf = gem_mmap__cpu(drm_fd, handle, 0, buf_size, 0);
> > -     }
> > +     gem_buf = __gem_mmap_offset(drm_fd, handle, 0, buf_size,
> > +                                 PROT_READ | PROT_WRITE, t->type);
> > +     igt_require(gem_buf);
> >  
> >       igt_assert(wait_for_suspended());
> >  
> > @@ -2014,10 +2005,13 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)
> >               modeset_subtest(SCREEN_TYPE_NON_LPSP, 1, WAIT_STATUS | USE_DPMS);
> >  
> >       /* GEM */
> > -     igt_subtest("gem-mmap-cpu")
> > -             gem_mmap_subtest(false);
> > -     igt_subtest("gem-mmap-gtt")
> > -             gem_mmap_subtest(true);
> > +     igt_subtest_with_dynamic("gem-mmap-type") {
> > +             for_each_mmap_offset_type(t) {
> > +                     igt_dynamic_f("%s", t->name)
> > +                             gem_mmap_args(t);
> > +             }
> > +     }
> Chris,
> 
> This is what you suggested I guess. But what is the mmap_offset is not
> supported? shouldn't we have the legacy tests in such scenario?

mmap-offset is a pure extension of mmap-gtt.

There's no point testing the plain mmap_ioctl in this test as that does
not use i915 for fault handling; it is independent of our rpm.
-Chris