From: Daniel Vetter Date: Mon, 22 Jul 2013 07:24:43 +0000 (+0200) Subject: tests/gem_suspend: exercise fence restore code X-Git-Tag: intel-gpu-tools-1.4~291 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=10834f86102e7dae242a0cbda463a2d7543401dd;p=platform%2Fupstream%2Fintel-gpu-tools.git tests/gem_suspend: exercise fence restore code This exercise the bug fixed in commit 94a335dba34ff47cad3d6d0c29b452d43a1be3c8 Author: Daniel Vetter Date: Wed Jul 17 14:51:28 2013 +0200 drm/i915: correctly restore fences with objects attached For fun I've also added a subtest for the inverse transition. Signed-off-by: Daniel Vetter --- diff --git a/lib/drmtest.c b/lib/drmtest.c index 26748b3..a18e61f 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -1655,3 +1655,10 @@ int drmtest_enable_prefault(void) return drmtest_prefault_control(true); } +void drmtest_system_suspend_autoresume(void) +{ + int ret; + + ret = system("rtcwake -s 30 -m mem"); + assert(ret == 0); +} diff --git a/lib/drmtest.h b/lib/drmtest.h index b6bfbc9..5961d73 100644 --- a/lib/drmtest.h +++ b/lib/drmtest.h @@ -189,3 +189,6 @@ int drmtest_set_vt_graphics_mode(void); /* prefault disabling, needs the corresponding debugfs interface */ int drmtest_disable_prefault(void); int drmtest_enable_prefault(void); + +/* suspend and auto-resume system */ +void drmtest_system_suspend_autoresume(void); diff --git a/tests/.gitignore b/tests/.gitignore index d256695..d8256a4 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -64,6 +64,7 @@ gem_storedw_loop_bsd gem_storedw_loop_render gem_storedw_loop_vebox gem_stress +gem_suspend gem_threaded_access_tiled gem_tiled_blits gem_tiled_fence_blits diff --git a/tests/Makefile.am b/tests/Makefile.am index c692b0c..7365a84 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -32,6 +32,7 @@ TESTS_progs_M = \ gem_pread_after_blit \ gem_ringfill \ gem_set_tiling_vs_blt \ + gem_suspend \ gem_tiled_blits \ gem_tiled_partial_pwrite_pread \ gem_write_read_ring_switch \ diff --git a/tests/gem_suspend.c b/tests/gem_suspend.c new file mode 100644 index 0000000..a31161d --- /dev/null +++ b/tests/gem_suspend.c @@ -0,0 +1,117 @@ +/* + * Copyright © 2013 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 + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "drm.h" +#include "i915_drm.h" +#include "drmtest.h" + +#define OBJECT_SIZE (16*1024*1024) + +static void +test_fence_restore(int fd, bool tiled2untiled) +{ + uint32_t handle1, handle2, handle_tiled; + uint32_t *ptr1, *ptr2, *ptr_tiled; + int i; + + /* We wall the tiled object with untiled canary objects to make sure + * that we detect tile leaking in both directions. */ + handle1 = gem_create(fd, OBJECT_SIZE); + handle2 = gem_create(fd, OBJECT_SIZE); + handle_tiled = gem_create(fd, OBJECT_SIZE); + + /* Access the buffer objects in the order we want to have the laid out. */ + ptr1 = gem_mmap(fd, handle1, OBJECT_SIZE, PROT_READ | PROT_WRITE); + assert(ptr1 != MAP_FAILED); + for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++) + ptr1[i] = i; + + ptr_tiled = gem_mmap(fd, handle_tiled, OBJECT_SIZE, PROT_READ | PROT_WRITE); + assert(ptr_tiled != MAP_FAILED); + if (tiled2untiled) + gem_set_tiling(fd, handle_tiled, I915_TILING_X, 2048); + for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++) + ptr_tiled[i] = i; + + ptr2 = gem_mmap(fd, handle2, OBJECT_SIZE, PROT_READ | PROT_WRITE); + assert(ptr2 != MAP_FAILED); + for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++) + ptr2[i] = i; + + if (tiled2untiled) + gem_set_tiling(fd, handle_tiled, I915_TILING_NONE, 2048); + else + gem_set_tiling(fd, handle_tiled, I915_TILING_X, 2048); + + drmtest_system_suspend_autoresume(); + + printf("checking the first canary object\n"); + for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++) + assert(ptr1[i] == i); + + printf("checking the second canary object\n"); + for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++) + assert(ptr2[i] == i); + + gem_close(fd, handle1); + gem_close(fd, handle2); + gem_close(fd, handle_tiled); + + munmap(ptr1, OBJECT_SIZE); + munmap(ptr2, OBJECT_SIZE); + munmap(ptr_tiled, OBJECT_SIZE); +} + +int main(int argc, char **argv) +{ + int fd; + + drmtest_subtest_init(argc, argv); + + fd = drm_open_any(); + + if (drmtest_run_subtest("fence-restore-tiled2untiled")) + test_fence_restore(fd, true); + + if (drmtest_run_subtest("fence-restore-untiled")) + test_fence_restore(fd, false); + + close(fd); + + return 0; +}