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

lib/ioctls: make gem_context_set/get_param infallible

Browse Source 
We have separate require checks already, so these failing is a bug in
the test logic.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
This commit is contained in:
Daniel Vetter 2015-02-06 11:10:25 +01:00
parent 15801b4dad
commit 8d21b39251
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/igt_gt.c
View File

@ -55,7 +55,7 @@ struct igt_hang_ring igt_hang_ring(int fd, int gen, int ring)
ban = param.value; ban = param.value;
param.value = 0; param.value = 0;
igt_require(gem_context_set_param(fd, &param) == 0); gem_context_set_param(fd, &param);
memset(&reloc, 0, sizeof(reloc)); memset(&reloc, 0, sizeof(reloc));
memset(&exec, 0, sizeof(exec)); memset(&exec, 0, sizeof(exec));

18
lib/ioctl_wrappers.c
View File

@ -1058,26 +1058,18 @@ off_t prime_get_size(int dma_buf_fd)
return ret; return ret;
} }
int gem_context_get_param(int fd, struct local_i915_gem_context_param *p) void gem_context_get_param(int fd, struct local_i915_gem_context_param *p)
{ {
#define LOCAL_I915_GEM_CONTEXT_GETPARAM 0x34 #define LOCAL_I915_GEM_CONTEXT_GETPARAM 0x34
#define LOCAL_IOCTL_I915_GEM_CONTEXT_GETPARAM DRM_IOWR (DRM_COMMAND_BASE + LOCAL_I915_GEM_CONTEXT_GETPARAM, struct local_i915_gem_context_param) #define LOCAL_IOCTL_I915_GEM_CONTEXT_GETPARAM DRM_IOWR (DRM_COMMAND_BASE + LOCAL_I915_GEM_CONTEXT_GETPARAM, struct local_i915_gem_context_param)
if (drmIoctl(fd, LOCAL_IOCTL_I915_GEM_CONTEXT_GETPARAM, p)) do_ioctl(fd, LOCAL_IOCTL_I915_GEM_CONTEXT_GETPARAM, p);
return -1;
errno = 0;
return 0;
} }
int gem_context_set_param(int fd, struct local_i915_gem_context_param *p) void gem_context_set_param(int fd, struct local_i915_gem_context_param *p)
{ {
#define LOCAL_I915_GEM_CONTEXT_SETPARAM 0x35 #define LOCAL_I915_GEM_CONTEXT_SETPARAM 0x35
#define LOCAL_IOCTL_I915_GEM_CONTEXT_SETPARAM DRM_IOWR (DRM_COMMAND_BASE + LOCAL_I915_GEM_CONTEXT_SETPARAM, struct local_i915_gem_context_param) #define LOCAL_IOCTL_I915_GEM_CONTEXT_SETPARAM DRM_IOWR (DRM_COMMAND_BASE + LOCAL_I915_GEM_CONTEXT_SETPARAM, struct local_i915_gem_context_param)
if (drmIoctl(fd, LOCAL_IOCTL_I915_GEM_CONTEXT_SETPARAM, p)) do_ioctl(fd, LOCAL_IOCTL_I915_GEM_CONTEXT_SETPARAM, p);
return -1;
errno = 0;
return 0;
} }
void gem_context_require_param(int fd, uint64_t param) void gem_context_require_param(int fd, uint64_t param)
@ -1089,5 +1081,5 @@ void gem_context_require_param(int fd, uint64_t param)
p.value = 0; p.value = 0;
p.size = 0; p.size = 0;
igt_require(gem_context_get_param(fd, &p) == 0); igt_require(drmIoctl(fd, LOCAL_I915_GEM_CONTEXT_GETPARAM, &p) == 0);
} }

4
lib/ioctl_wrappers.h
View File

@ -132,7 +132,7 @@ struct local_i915_gem_context_param {
}; };
void gem_context_require_param(int fd, uint64_t param); void gem_context_require_param(int fd, uint64_t param);
int gem_context_get_param(int fd, struct local_i915_gem_context_param *p); void gem_context_get_param(int fd, struct local_i915_gem_context_param *p);
int gem_context_set_param(int fd, struct local_i915_gem_context_param *p); void gem_context_set_param(int fd, struct local_i915_gem_context_param *p);
#endif /* IOCTL_WRAPPERS_H */ #endif /* IOCTL_WRAPPERS_H */