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

lib/ioctl_wrappers: Explain a couple of igt_require(ret == 0)

Browse Source 
Use more verbose igt_require(), here assocaited with SET_CACHING, such
that the requirements are explained in the debug/failure log.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2016-03-18 11:49:23 +00:00
parent a8a685f877
commit 95090bb50b
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/ioctl_wrappers.c
View File

@ -180,6 +180,23 @@ struct local_drm_i915_gem_caching {
#define LOCAL_DRM_IOCTL_I915_GEM_GET_CACHEING \ #define LOCAL_DRM_IOCTL_I915_GEM_GET_CACHEING \
DRM_IOWR(DRM_COMMAND_BASE + LOCAL_DRM_I915_GEM_GET_CACHEING, struct local_drm_i915_gem_caching) DRM_IOWR(DRM_COMMAND_BASE + LOCAL_DRM_I915_GEM_GET_CACHEING, struct local_drm_i915_gem_caching)
static int __gem_set_caching(int fd, uint32_t handle, uint32_t caching)
{
struct local_drm_i915_gem_caching arg;
int err;
memset(&arg, 0, sizeof(arg));
arg.handle = handle;
arg.caching = caching;
err = 0;
if (drmIoctl(fd, LOCAL_DRM_IOCTL_I915_GEM_SET_CACHEING, &arg)) {
err = -errno;
igt_assert(errno == ENOTTY || errno == EINVAL);
}
return err;
}
/** /**
* gem_set_caching: * gem_set_caching:
* @fd: open i915 drm file descriptor * @fd: open i915 drm file descriptor
@ -193,17 +210,7 @@ struct local_drm_i915_gem_caching {
*/ */
void gem_set_caching(int fd, uint32_t handle, uint32_t caching) void gem_set_caching(int fd, uint32_t handle, uint32_t caching)
{ {
struct local_drm_i915_gem_caching arg; igt_require(__gem_set_caching(fd, handle, caching) == 0);
int ret;
memset(&arg, 0, sizeof(arg));
arg.handle = handle;
arg.caching = caching;
ret = drmIoctl(fd, LOCAL_DRM_IOCTL_I915_GEM_SET_CACHEING, &arg);
igt_assert(ret == 0 || (errno == ENOTTY || errno == EINVAL));
igt_require(ret == 0);
errno = 0; errno = 0;
} }
@ -221,8 +228,8 @@ uint32_t gem_get_caching(int fd, uint32_t handle)
struct local_drm_i915_gem_caching arg; struct local_drm_i915_gem_caching arg;
int ret; int ret;
memset(&arg, 0, sizeof(arg));
arg.handle = handle; arg.handle = handle;
arg.caching = 0;
ret = ioctl(fd, LOCAL_DRM_IOCTL_I915_GEM_GET_CACHEING, &arg); ret = ioctl(fd, LOCAL_DRM_IOCTL_I915_GEM_GET_CACHEING, &arg);
igt_assert(ret == 0); igt_assert(ret == 0);
errno = 0; errno = 0;
@ -1330,18 +1337,12 @@ bool gem_has_softpin(int fd)
*/ */
void gem_require_caching(int fd) void gem_require_caching(int fd)
{ {
struct local_drm_i915_gem_caching arg; uint32_t handle;
int ret;
memset(&arg, 0, sizeof(arg)); handle = gem_create(fd, 4096);
arg.handle = gem_create(fd, 4096); gem_set_caching(fd, handle, 0);
igt_assert(arg.handle != 0); gem_close(fd, handle);
arg.caching = 0;
ret = ioctl(fd, LOCAL_DRM_IOCTL_I915_GEM_SET_CACHEING, &arg);
gem_close(fd, arg.handle);
igt_require(ret == 0);
errno = 0; errno = 0;
} }