diff options
author | Dominik Grzegorzek <dominik.grzegorzek@intel.com> | 2020-07-10 14:19:20 +0200 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-07-10 20:51:20 +0100 |
commit | 4c3676b3461c7f101f981e13d92c5fa80a907ba9 (patch) | |
tree | 05f0d236d8afdf5291c6c7edd7d95ae622df99ea /tests | |
parent | 9d9b369dc5b15dfe6d1ed7bbb77080a577096600 (diff) |
i915/gem_bad_blit.c: Remove
HW handling tests are not worth the maintenance
as they do not actually validate themselves.
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 | 5 | ||||
-rw-r--r-- | tests/i915/gem_bad_blit.c | 117 | ||||
-rw-r--r-- | tests/meson.build | 1 |
3 files changed, 1 insertions, 122 deletions
diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 18a94ad98..3af960545 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -541,10 +541,7 @@ kernel_tests_full = \ # IMPORTANT: These tests here are all disabled because the result in sometime # unrecoverable gpu hangs. Don't put real testcases here. -HANG = gem_bad_blit -gem_bad_blit_SOURCES = i915/gem_bad_blit.c - -HANG += gem_non_secure_batch +HANG = gem_non_secure_batch gem_non_secure_batch_SOURCES = i915/gem_non_secure_batch.c $(NULL) diff --git a/tests/i915/gem_bad_blit.c b/tests/i915/gem_bad_blit.c deleted file mode 100644 index 848e19756..000000000 --- a/tests/i915/gem_bad_blit.c +++ /dev/null @@ -1,117 +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> - * - */ - -/** @file gem_tiled_blits.c - * - * This is a test of doing many tiled blits, with a working set - * larger than the aperture size. - * - * The goal is to catch a couple types of failure; - * - Fence management problems on pre-965. - * - A17 or L-shaped memory tiling workaround problems in acceleration. - * - * The model is to fill a collection of 1MB objects in a way that can't trip - * over A6 swizzling -- upload data to a non-tiled object, blit to the tiled - * object. Then, copy the 1MB objects randomly between each other for a while. - * Finally, download their data through linear objects again and see what - * resulted. - */ - -#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 "i915/gem.h" -#include "igt.h" -#include "intel_bufmgr.h" - -static drm_intel_bufmgr *bufmgr; -struct intel_batchbuffer *batch; - -#define BAD_GTT_DEST (256*1024*1024ULL) /* past end of aperture */ - -static void -bad_blit(drm_intel_bo *src_bo, uint32_t devid) -{ - uint32_t src_pitch = 512, dst_pitch = 512; - uint32_t cmd_bits = 0; - - if (IS_965(devid)) { - src_pitch /= 4; - cmd_bits |= XY_SRC_COPY_BLT_SRC_TILED; - } - - if (IS_965(devid)) { - dst_pitch /= 4; - cmd_bits |= XY_SRC_COPY_BLT_DST_TILED; - } - - BLIT_COPY_BATCH_START(cmd_bits); - OUT_BATCH((3 << 24) | /* 32 bits */ - (0xcc << 16) | /* copy ROP */ - dst_pitch); - OUT_BATCH(0); /* dst x1,y1 */ - OUT_BATCH((64 << 16) | 64); /* 64x64 blit */ - OUT_BATCH(BAD_GTT_DEST); - if (batch->gen >= 8) - OUT_BATCH(BAD_GTT_DEST >> 32); /* Upper 16 bits */ - OUT_BATCH(0); /* src x1,y1 */ - OUT_BATCH(src_pitch); - OUT_RELOC_FENCED(src_bo, I915_GEM_DOMAIN_RENDER, 0, 0); - ADVANCE_BATCH(); - - intel_batchbuffer_flush(batch); -} - -igt_simple_main -{ - drm_intel_bo *src; - int fd; - - fd = drm_open_driver(DRIVER_INTEL); - igt_require_gem(fd); - gem_require_blitter(fd); - - 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)); - - src = drm_intel_bo_alloc(bufmgr, "src", 128 * 128, 4096); - - bad_blit(src, batch->devid); - - intel_batchbuffer_free(batch); - drm_intel_bufmgr_destroy(bufmgr); - - close(fd); -} diff --git a/tests/meson.build b/tests/meson.build index 72acb32b1..947289e75 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -407,7 +407,6 @@ executable('gem_stress', 'i915/gem_stress.c', # IMPORTANT: These tests here are all disabled because the result in sometime # unrecoverable gpu hangs. Don't put real testcases here. hang_progs = [ - 'gem_bad_blit', 'gem_non_secure_batch', ] foreach prog : hang_progs |