flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-19 22:06:13 +00:00
Code Issues Releases Wiki Activity

test/gem_userptr_*: Fix compile fail

Browse Source 
Also shut up warnings. Those revealed incorrect usage of local
variables in conjunction with igt_fixture/igt_subtest. Since those use
longjmps we need to move the out of the stackframe those magic blocks
are declared in.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-04-25 17:52:02 +02:00
parent d3057d7a1e
commit 1b55886c4b
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
benchmarks/gem_userptr_benchmark.c
View File

@ -42,8 +42,11 @@
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/mman.h>
#include <signal.h>
#include "drm.h"
#include "i915_drm.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
@ -288,7 +291,6 @@ static void test_ptr_read(void *ptr)
unsigned long iter = 0;
volatile unsigned long *p;
unsigned long i, loops;
register unsigned long v;
loops = BO_SIZE / sizeof(unsigned long) / 4;
@ -297,10 +299,10 @@ static void test_ptr_read(void *ptr)
while (run_test) {
p = (unsigned long *)ptr;
for (i = 0; i < loops; i++) {
v = *p++;
v = *p++;
v = *p++;
v = *p++;
(void)*p++;
(void)*p++;
(void)*p++;
(void)*p++;
}
iter++;
}

14
tests/gem_userptr_blits.c
View File

@ -46,8 +46,11 @@
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/mman.h>
#include <signal.h>
#include "drm.h"
#include "i915_drm.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
@ -1039,17 +1042,22 @@ static int test_unmap_cycles(int fd, int expected)
return 0;
}
unsigned int total_ram;
uint64_t aperture_size;
int fd, count, size = 0, ret;
int main(int argc, char **argv)
{
uint64_t aperture_size;
unsigned int total_ram;
int fd = -1, count = 0, size = 0, ret;
int size = sizeof(linear);
igt_skip_on_simulation();
igt_subtest_init(argc, argv);
igt_fixture {
int ret;
fd = drm_open_any();
igt_assert(fd >= 0);