| Message ID | 1480325841-19022-1-git-send-email-abdiel.janulgue@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Op 28-11-16 om 10:37 schreef Abdiel Janulgue: > Pretend to run on a non-intel machine even when running on i915.ko, > so that we could run and gather passrate data. > Signed-off-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com> > --- > lib/drmtest.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/lib/drmtest.c b/lib/drmtest.c > index 44abc7e..a8b75e8 100644 > --- a/lib/drmtest.c > +++ b/lib/drmtest.c > @@ -254,8 +254,11 @@ int __drm_open_driver(int chipset) > continue; > > if (chipset & DRIVER_INTEL && is_i915_device(fd) && > - has_known_intel_chipset(fd)) > + has_known_intel_chipset(fd)) { > + igt_skip_on_f(getenv("IGT_GENERIC_ONLY"), > + "Generic tests only\n"); > return fd; > + } This will make the passrate worse for any driver that has DRIVER_ANY set. > > if (chipset & DRIVER_VC4 && > is_vc4_device(fd)) > @@ -415,5 +418,6 @@ int drm_open_driver_render(int chipset) > > void igt_require_intel(int fd) > { > + igt_skip_on_f(getenv("IGT_GENERIC_ONLY"), "Generic tests only\n"); > igt_require(is_i915_device(fd) && has_known_intel_chipset(fd)); > } > Won't it be better to only put the hack in is_i915_device only? Some code in IGT checks that too. ~Maarten
On Mon, Nov 28, 2016 at 01:07:36PM +0100, Maarten Lankhorst wrote: > Op 28-11-16 om 10:37 schreef Abdiel Janulgue: > > Pretend to run on a non-intel machine even when running on i915.ko, > > so that we could run and gather passrate data. What exactly do you mean? > > Signed-off-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com> > > --- > > lib/drmtest.c | 6 +++++- > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/lib/drmtest.c b/lib/drmtest.c > > index 44abc7e..a8b75e8 100644 > > --- a/lib/drmtest.c > > +++ b/lib/drmtest.c > > @@ -254,8 +254,11 @@ int __drm_open_driver(int chipset) > > continue; > > > > if (chipset & DRIVER_INTEL && is_i915_device(fd) && > > - has_known_intel_chipset(fd)) > > + has_known_intel_chipset(fd)) { > > + igt_skip_on_f(getenv("IGT_GENERIC_ONLY"), > > + "Generic tests only\n"); > > return fd; > > + } > > This will make the passrate worse for any driver that has DRIVER_ANY set. DRIVER_ANY being the key here. It sounds like you should argue for doing that generic test first. -Chris
On 11/28/2016 02:20 PM, Chris Wilson wrote: > On Mon, Nov 28, 2016 at 01:07:36PM +0100, Maarten Lankhorst wrote: >> Op 28-11-16 om 10:37 schreef Abdiel Janulgue: >>> Pretend to run on a non-intel machine even when running on i915.ko, >>> so that we could run and gather passrate data. > > What exactly do you mean? We need a list of generic test-cases that isn't dependent on i915. Would be good to have a subset of generic tests cases. > >>> Signed-off-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com> >>> --- >>> lib/drmtest.c | 6 +++++- >>> 1 file changed, 5 insertions(+), 1 deletion(-) >>> >>> diff --git a/lib/drmtest.c b/lib/drmtest.c >>> index 44abc7e..a8b75e8 100644 >>> --- a/lib/drmtest.c >>> +++ b/lib/drmtest.c >>> @@ -254,8 +254,11 @@ int __drm_open_driver(int chipset) >>> continue; >>> >>> if (chipset & DRIVER_INTEL && is_i915_device(fd) && >>> - has_known_intel_chipset(fd)) >>> + has_known_intel_chipset(fd)) { >>> + igt_skip_on_f(getenv("IGT_GENERIC_ONLY"), >>> + "Generic tests only\n"); >>> return fd; >>> + } >> >> This will make the passrate worse for any driver that has DRIVER_ANY set. > > DRIVER_ANY being the key here. It sounds like you should argue for doing > that generic test first. > -Chris >
diff --git a/lib/drmtest.c b/lib/drmtest.c index 44abc7e..a8b75e8 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -254,8 +254,11 @@ int __drm_open_driver(int chipset) continue; if (chipset & DRIVER_INTEL && is_i915_device(fd) && - has_known_intel_chipset(fd)) + has_known_intel_chipset(fd)) { + igt_skip_on_f(getenv("IGT_GENERIC_ONLY"), + "Generic tests only\n"); return fd; + } if (chipset & DRIVER_VC4 && is_vc4_device(fd)) @@ -415,5 +418,6 @@ int drm_open_driver_render(int chipset) void igt_require_intel(int fd) { + igt_skip_on_f(getenv("IGT_GENERIC_ONLY"), "Generic tests only\n"); igt_require(is_i915_device(fd) && has_known_intel_chipset(fd)); }
Pretend to run on a non-intel machine even when running on i915.ko, so that we could run and gather passrate data. Signed-off-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com> --- lib/drmtest.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)