diff options
author | Dominik Grzegorzek <dominik.grzegorzek@intel.com> | 2020-07-06 09:21:18 +0200 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-07-06 18:58:38 +0100 |
commit | 5da80efbc7a2d5bd7b30c0f9eb4b5d001c99b558 (patch) | |
tree | a498295495a6c45e42558b1156dbdc3f58ad211c /tests | |
parent | 897d21d14e99090fe0c4e6e8e4307f4a3102c78e (diff) |
i915/gem_hang: Removal
Remove gem_hang because it's not correct for more recent
gen and redundant with the hangcheck checks.
Signed-off-by: Dominik Grzegorzek <dominik.grzegorzek@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 | 3 | ||||
-rw-r--r-- | tests/i915/gem_hang.c | 98 | ||||
-rw-r--r-- | tests/meson.build | 1 |
3 files changed, 0 insertions, 102 deletions
diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 57f8e0ed9..3b897bc54 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -547,9 +547,6 @@ kernel_tests_full = \ HANG = gem_bad_batch gem_bad_batch_SOURCES = i915/gem_bad_batch.c -HANG += gem_hang -gem_hang_SOURCES = i915/gem_hang.c - HANG += gem_bad_blit gem_bad_blit_SOURCES = i915/gem_bad_blit.c diff --git a/tests/i915/gem_hang.c b/tests/i915/gem_hang.c deleted file mode 100644 index 2c61cac04..000000000 --- a/tests/i915/gem_hang.c +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright © 2009 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: - * Eric Anholt <eric@anholt.net> - * Jesse Barnes <jbarnes@virtuousgeek.org> (based on gem_bad_blit.c) - * - */ - -#include "igt.h" -#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 "intel_bufmgr.h" - -static drm_intel_bufmgr *bufmgr; -struct intel_batchbuffer *batch; -static int bad_pipe; - -static void -gpu_hang(void) -{ - int cmd; - - cmd = bad_pipe ? MI_WAIT_FOR_PIPEB_SCAN_LINE_WINDOW : - MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW; - - BEGIN_BATCH(6, 0); - /* The documentation says that the LOAD_SCAN_LINES command - * always comes in pairs. Don't ask me why. */ - OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | (bad_pipe << 20)); - OUT_BATCH((0 << 16) | 2048); - OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | (bad_pipe << 20)); - OUT_BATCH((0 << 16) | 2048); - OUT_BATCH(MI_WAIT_FOR_EVENT | cmd); - OUT_BATCH(MI_NOOP); - ADVANCE_BATCH(); - - intel_batchbuffer_flush(batch); -} - -static int opt_handler(int opt, int opt_index, void *data) -{ - switch (opt) { - case 'p': - bad_pipe = atoi(optarg); - break; - default: - return IGT_OPT_HANDLER_ERROR; - } - - return IGT_OPT_HANDLER_SUCCESS; -} - -const char *help_str = " -p\tDisabled pipe number\n"; - -igt_simple_main_args("p:", NULL, help_str, opt_handler, NULL) -{ - int fd; - - fd = drm_open_driver(DRIVER_INTEL); - - bufmgr = drm_intel_bufmgr_gem_init(fd, 4096); - drm_intel_bufmgr_gem_enable_reuse(bufmgr); - batch = intel_batchbuffer_alloc(bufmgr, intel_get_drm_devid(fd)); - - gpu_hang(); - - intel_batchbuffer_free(batch); - drm_intel_bufmgr_destroy(bufmgr); - - close(fd); -} diff --git a/tests/meson.build b/tests/meson.build index 06a47e374..172d18e59 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -409,7 +409,6 @@ executable('gem_stress', 'i915/gem_stress.c', # unrecoverable gpu hangs. Don't put real testcases here. hang_progs = [ 'gem_bad_batch', - 'gem_hang', 'gem_bad_blit', 'gem_bad_address', 'gem_non_secure_batch', |