diff options
author | Dominik Grzegorzek <dominik.grzegorzek@intel.com> | 2020-07-10 14:19:21 +0200 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-07-10 20:51:20 +0100 |
commit | 8a50ca9985d2dbb0293186c3286af46468fb4b84 (patch) | |
tree | 4b6fb4291cff40bb7b5d6c967e83af56b454a4af /tests | |
parent | 4c3676b3461c7f101f981e13d92c5fa80a907ba9 (diff) |
i915/gem_non_secure_batch.c: Remove
Removal of gem_non_secure_batch as a last of disabled
HANG(in Makefile.sources) tests.
Signed-off-by: Dominik Grzegorzek <dominik.grzegorzek@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.sources | 7 | ||||
-rw-r--r-- | tests/i915/gem_non_secure_batch.c | 109 | ||||
-rw-r--r-- | tests/meson.build | 11 |
3 files changed, 0 insertions, 127 deletions
diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 3af960545..2eca0f938 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -539,13 +539,6 @@ kernel_tests_full = \ $(extra_kernel_tests) \ $(NULL) -# IMPORTANT: These tests here are all disabled because the result in sometime -# unrecoverable gpu hangs. Don't put real testcases here. -HANG = gem_non_secure_batch -gem_non_secure_batch_SOURCES = i915/gem_non_secure_batch.c - - $(NULL) - scripts = \ ddx_intel_after_fbdev \ $(NULL) diff --git a/tests/i915/gem_non_secure_batch.c b/tests/i915/gem_non_secure_batch.c deleted file mode 100644 index 0bc2c3b5c..000000000 --- a/tests/i915/gem_non_secure_batch.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright © 2011 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. - * - * Authors: - * Daniel Vetter <daniel.vetter@ffwll.ch> (based on gem_storedw_*.c) - * - */ - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <fcntl.h> -#include <inttypes.h> -#include <errno.h> -#include <sys/stat.h> -#include <sys/time.h> - -#include "drm.h" -#include "i830_reg.h" -#include "i915/gem.h" -#include "igt.h" -#include "intel_bufmgr.h" - -IGT_TEST_DESCRIPTION("Basic check of non-secure batches."); - -static drm_intel_bufmgr *bufmgr; -struct intel_batchbuffer *batch; - -/* - * Testcase: Basic check of non-secure batches - * - * This test tries to stop the render ring with a MI_LOAD_REG command, which - * should fail if the non-secure handling works correctly. - */ - -static int num_rings = 1; - -static void -mi_lri_loop(void) -{ - int i; - - srandom(0xdeadbeef); - - for (i = 0; i < 0x100; i++) { - int ring = random() % num_rings + 1; - - BEGIN_BATCH(4, 0); - OUT_BATCH(MI_LOAD_REGISTER_IMM); - OUT_BATCH(0x203c); /* RENDER RING CTL */ - OUT_BATCH(0); /* try to stop the ring */ - OUT_BATCH(MI_NOOP); - ADVANCE_BATCH(); - - intel_batchbuffer_flush_on_ring(batch, ring); - } -} - -igt_simple_main -{ - int fd; - int devid; - - fd = drm_open_driver(DRIVER_INTEL); - devid = intel_get_drm_devid(fd); - - if (HAS_BSD_RING(devid)) - num_rings++; - - if (HAS_BLT_RING(devid)) - num_rings++; - - - igt_info("num rings detected: %i\n", num_rings); - - bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); - igt_assert(bufmgr); - drm_intel_bufmgr_gem_enable_reuse(bufmgr); - - batch = intel_batchbuffer_alloc(bufmgr, devid); - igt_assert(batch); - - mi_lri_loop(); - gem_quiescent_gpu(fd); - - intel_batchbuffer_free(batch); - drm_intel_bufmgr_destroy(bufmgr); - - close(fd); -} diff --git a/tests/meson.build b/tests/meson.build index 947289e75..5d07aedf6 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -404,17 +404,6 @@ executable('gem_stress', 'i915/gem_stress.c', install_rpath : libexecdir_rpathdir, dependencies : igt_deps) -# IMPORTANT: These tests here are all disabled because the result in sometime -# unrecoverable gpu hangs. Don't put real testcases here. -hang_progs = [ - 'gem_non_secure_batch', -] -foreach prog : hang_progs - executable(prog, join_paths('i915', prog + '.c'), - dependencies : igt_deps, - install : false) -endforeach - image_files = [ '1080p-left.png', '1080p-right.png', |