[Intel-gfx] [PATCH i-g-t 1/2] igt/gem_pwrite_snooped: Check for GEM before use

[Intel-gfx] [PATCH i-g-t 1/2] igt/gem_pwrite_snooped: Check for GEM before use

[Chris Wilson]

As we try to blit into the buffer to check CPU<->GPU snooping, we have
to check we have a functional GPU first.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 tests/gem_pwrite_snooped.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/gem_pwrite_snooped.c b/tests/gem_pwrite_snooped.c
index b19339560..47ccce8b7 100644
--- a/tests/gem_pwrite_snooped.c
+++ b/tests/gem_pwrite_snooped.c
@@ -130,6 +130,8 @@ igt_simple_main
 	igt_skip_on_simulation();
 
 	fd = drm_open_driver(DRIVER_INTEL);
+	igt_require_gem(fd);
+
 	devid = intel_get_drm_devid(fd);
 	bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
 
-- 
2.18.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[igt-dev] [PATCH i-g-t 2/2] igt: Remove gvt_basic

[Chris Wilson]

This was always a placeholder for GVT stakeholders to provide some
better tests. 2 years later and none have been put forward so stop
wasting CI's time running a placeholder.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106989
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Zhi Wang <zhi.a.wang@intel.com>
---
 tests/Makefile.sources                |  1 -
 tests/gvt_basic.c                     | 44 ---------------------------
 tests/intel-ci/fast-feedback.testlist |  1 -
 tests/meson.build                     |  1 -
 4 files changed, 47 deletions(-)
 delete mode 100644 tests/gvt_basic.c

diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 8fec6ffe6..d749040b7 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -162,7 +162,6 @@ TESTS_progs = \
 	gen3_render_mixed_blits \
 	gen3_render_tiledx_blits \
 	gen3_render_tiledy_blits \
-	gvt_basic \
 	i915_query \
 	kms_3d \
 	kms_addfb_basic \
diff --git a/tests/gvt_basic.c b/tests/gvt_basic.c
deleted file mode 100644
index 4e909a59f..000000000
--- a/tests/gvt_basic.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright © 2016 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#include "igt.h"
-#include "igt_gvt.h"
-
-IGT_TEST_DESCRIPTION("Basic sanity check of i915 Guest Virtualisation");
-
-igt_main
-{
-	int fd = -1;
-
-	igt_fixture {
-		igt_require(igt_gvt_load_module());
-		fd = __drm_open_driver(DRIVER_INTEL);
-	}
-
-	igt_subtest_f("invalid-placeholder-test");
-
-	igt_fixture {
-		close(fd);
-		igt_gvt_unload_module();
-	}
-}
diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
index aa861d39d..604085e22 100644
--- a/tests/intel-ci/fast-feedback.testlist
+++ b/tests/intel-ci/fast-feedback.testlist
@@ -289,4 +289,3 @@ igt@vgem_basic@unload
 igt@drv_module_reload@basic-reload
 igt@drv_module_reload@basic-no-display
 igt@drv_module_reload@basic-reload-inject
-igt@gvt_basic@invalid-placeholder-test
diff --git a/tests/meson.build b/tests/meson.build
index 704bd13f6..c56e417a9 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -138,7 +138,6 @@ test_progs = [
 	'gen3_render_mixed_blits',
 	'gen3_render_tiledx_blits',
 	'gen3_render_tiledy_blits',
-	'gvt_basic',
 	'i915_query',
 	'kms_3d',
 	'kms_addfb_basic',
-- 
2.18.0

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev