| Message ID | 1403797726-2413-1-git-send-email-jbarnes@virtuousgeek.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jun 26, 2014 at 08:48:46AM -0700, Jesse Barnes wrote: > The command parser may be present, but not active, so check for PPGTT > before allowing this test to run. > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > --- > tests/gem_exec_parse.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/tests/gem_exec_parse.c b/tests/gem_exec_parse.c > index e78a192..f7376e3 100644 > --- a/tests/gem_exec_parse.c > +++ b/tests/gem_exec_parse.c > @@ -198,7 +198,7 @@ int fd; > igt_main > { > igt_fixture { > - int parser_version = 0; > + int parser_version = 0, has_ppgtt = 0; > drm_i915_getparam_t gp; > int rc; > > @@ -209,6 +209,11 @@ igt_main > rc = drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp); > igt_require(!rc && parser_version > 0); > > + gp.param = I915_PARAM_HAS_ALIASING_PPGTT; > + gp.value = &has_ppgtt; > + rc = drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp); > + igt_require(!rc && has_ppgtt > 0); > + You could also shorten it to igt_require(gem_uses_aliasing_ppgtt(fd)); if you like. And sorry, I should have added that check in the first place. Brad > handle = gem_create(fd, 4096); > > /* ATM cmd parser only exists on gen7. */ > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/tests/gem_exec_parse.c b/tests/gem_exec_parse.c index e78a192..f7376e3 100644 --- a/tests/gem_exec_parse.c +++ b/tests/gem_exec_parse.c @@ -198,7 +198,7 @@ int fd; igt_main { igt_fixture { - int parser_version = 0; + int parser_version = 0, has_ppgtt = 0; drm_i915_getparam_t gp; int rc; @@ -209,6 +209,11 @@ igt_main rc = drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp); igt_require(!rc && parser_version > 0); + gp.param = I915_PARAM_HAS_ALIASING_PPGTT; + gp.value = &has_ppgtt; + rc = drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp); + igt_require(!rc && has_ppgtt > 0); + handle = gem_create(fd, 4096); /* ATM cmd parser only exists on gen7. */
The command parser may be present, but not active, so check for PPGTT before allowing this test to run. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> --- tests/gem_exec_parse.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)