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/prime_nv_test: use gem drmtest functions for pread/pwrite

Browse Source 
Different argument order, otherwise the same.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2013-07-15 11:12:31 +02:00
parent bc1a85e813
commit d64a9458b2
1 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tests/prime_nv_test.c
View File

@ -343,37 +343,6 @@ static int test_i915_import_gtt_mmap(void)
return ret;
}
static int do_read(int fd, int handle, void *buf, int offset, int size)
{
struct drm_i915_gem_pread intel_pread;
/* Ensure that we don't have any convenient data in buf in case
* we fail.
*/
memset(buf, 0xd0, size);
memset(&intel_pread, 0, sizeof(intel_pread));
intel_pread.handle = handle;
intel_pread.data_ptr = (uintptr_t)buf;
intel_pread.size = size;
intel_pread.offset = offset;
return ioctl(fd, DRM_IOCTL_I915_GEM_PREAD, &intel_pread);
}
static int do_write(int fd, int handle, void *buf, int offset, int size)
{
struct drm_i915_gem_pwrite intel_pwrite;
memset(&intel_pwrite, 0, sizeof(intel_pwrite));
intel_pwrite.handle = handle;
intel_pwrite.data_ptr = (uintptr_t)buf;
intel_pwrite.size = size;
intel_pwrite.offset = offset;
return ioctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &intel_pwrite);
}
/* test 7 - import from nouveau into intel, test pread/pwrite fail */
static int test_i915_import_pread_pwrite(void)
{
@ -406,18 +375,10 @@ static int test_i915_import_pread_pwrite(void)
ptr = nvbo->map;
*ptr = 0xdeadbeef;
ret = do_read(intel_fd, test_intel_bo->handle, buf, 0, 256);
if (ret) {
fprintf(stderr,"pread failed %d\n", errno);
goto out;
}
gem_read(intel_fd, test_intel_bo->handle, 0, buf, 256);
buf[0] = 0xabcdef55;
ret = do_write(intel_fd, test_intel_bo->handle, buf, 0, 4);
if (ret) {
fprintf(stderr,"pwrite failed %d\n", errno);
goto out;
}
gem_write(intel_fd, test_intel_bo->handle, 0, buf, 4);
out:
nouveau_bo_ref(NULL, &nvbo);
drm_intel_bo_unreference(test_intel_bo);