diff options
author | Eric Anholt <eric@anholt.net> | 2017-11-10 12:49:14 -0800 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2017-11-21 09:52:57 -0800 |
commit | aa97faa3828488478d97c1fce51650591681bdc9 (patch) | |
tree | 3d56dda9b811413245d59fab786736af8e9ffb53 /lib/i915 | |
parent | 53efeac5b9b67c35483ee2e5db6fdfc1665de12f (diff) |
lib: Use drm-uapi/i915_drm.h instead of local defines.
The MMAP_V2 is replaced by just using MMAP, since the official header
has the updated struct. The gem_create_v2 and gem_get_aperture are
left as is, because they seem to not be reflected in the UABI header!
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Petri Latvala <petri.latvala@intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'lib/i915')
-rw-r--r-- | lib/i915/gem_context.c | 46 | ||||
-rw-r--r-- | lib/i915/gem_context.h | 19 |
2 files changed, 25 insertions, 40 deletions
diff --git a/lib/i915/gem_context.c b/lib/i915/gem_context.c index 6d9edf5e..8f383a97 100644 --- a/lib/i915/gem_context.c +++ b/lib/i915/gem_context.c @@ -100,11 +100,9 @@ void gem_context_destroy(int fd, uint32_t ctx_id) do_ioctl(fd, DRM_IOCTL_I915_GEM_CONTEXT_DESTROY, &destroy); } -int __gem_context_get_param(int fd, struct local_i915_gem_context_param *p) +int __gem_context_get_param(int fd, struct drm_i915_gem_context_param *p) { -#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) - if (igt_ioctl(fd, LOCAL_IOCTL_I915_GEM_CONTEXT_GETPARAM, p)) + if (igt_ioctl(fd, DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM, p)) return -errno; errno = 0; @@ -119,17 +117,15 @@ int __gem_context_get_param(int fd, struct local_i915_gem_context_param *p) * This wraps the CONTEXT_GET_PARAM ioctl, which is used to get a context * parameter. */ -void gem_context_get_param(int fd, struct local_i915_gem_context_param *p) +void gem_context_get_param(int fd, struct drm_i915_gem_context_param *p) { igt_assert(__gem_context_get_param(fd, p) == 0); } -int __gem_context_set_param(int fd, struct local_i915_gem_context_param *p) +int __gem_context_set_param(int fd, struct drm_i915_gem_context_param *p) { -#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) - if (igt_ioctl(fd, LOCAL_IOCTL_I915_GEM_CONTEXT_SETPARAM, p)) + if (igt_ioctl(fd, DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM, p)) return -errno; errno = 0; @@ -143,7 +139,7 @@ int __gem_context_set_param(int fd, struct local_i915_gem_context_param *p) * This wraps the CONTEXT_SET_PARAM ioctl, which is used to set a context * parameter. */ -void gem_context_set_param(int fd, struct local_i915_gem_context_param *p) +void gem_context_set_param(int fd, struct drm_i915_gem_context_param *p) { igt_assert(__gem_context_set_param(fd, p) == 0); } @@ -158,14 +154,14 @@ void gem_context_set_param(int fd, struct local_i915_gem_context_param *p) */ void gem_context_require_param(int fd, uint64_t param) { - struct local_i915_gem_context_param p; + struct drm_i915_gem_context_param p; - p.context = 0; + p.ctx_id = 0; p.param = param; p.value = 0; p.size = 0; - igt_require(igt_ioctl(fd, LOCAL_IOCTL_I915_GEM_CONTEXT_GETPARAM, &p) == 0); + igt_require(igt_ioctl(fd, DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM, &p) == 0); } void gem_context_require_bannable(int fd) @@ -174,31 +170,31 @@ void gem_context_require_bannable(int fd) static int has_bannable = -1; if (has_bannable < 0) { - struct local_i915_gem_context_param p; + struct drm_i915_gem_context_param p; - p.context = 0; - p.param = LOCAL_CONTEXT_PARAM_BANNABLE; + p.ctx_id = 0; + p.param = I915_CONTEXT_PARAM_BANNABLE; p.value = 0; p.size = 0; - has_bannable = igt_ioctl(fd, LOCAL_IOCTL_I915_GEM_CONTEXT_GETPARAM, &p) == 0; + has_bannable = igt_ioctl(fd, DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM, &p) == 0; } if (has_ban_period < 0) { - struct local_i915_gem_context_param p; + struct drm_i915_gem_context_param p; - p.context = 0; - p.param = LOCAL_CONTEXT_PARAM_BAN_PERIOD; + p.ctx_id = 0; + p.param = I915_CONTEXT_PARAM_BAN_PERIOD; p.value = 0; p.size = 0; - has_ban_period = igt_ioctl(fd, LOCAL_IOCTL_I915_GEM_CONTEXT_GETPARAM, &p) == 0; + has_ban_period = igt_ioctl(fd, DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM, &p) == 0; } igt_require(has_ban_period || has_bannable); } -#define LOCAL_I915_CONTEXT_PARAM_PRIORITY 0x6 +#define DRM_I915_CONTEXT_PARAM_PRIORITY 0x6 /** * __gem_context_set_priority: @@ -214,12 +210,12 @@ void gem_context_require_bannable(int fd) */ int __gem_context_set_priority(int fd, uint32_t ctx_id, int prio) { - struct local_i915_gem_context_param p; + struct drm_i915_gem_context_param p; memset(&p, 0, sizeof(p)); - p.context = ctx_id; + p.ctx_id = ctx_id; p.size = 0; - p.param = LOCAL_I915_CONTEXT_PARAM_PRIORITY; + p.param = DRM_I915_CONTEXT_PARAM_PRIORITY; p.value = prio; return __gem_context_set_param(fd, &p); diff --git a/lib/i915/gem_context.h b/lib/i915/gem_context.h index a2339c4b..96106b71 100644 --- a/lib/i915/gem_context.h +++ b/lib/i915/gem_context.h @@ -27,23 +27,12 @@ uint32_t gem_context_create(int fd); void gem_context_destroy(int fd, uint32_t ctx_id); int __gem_context_destroy(int fd, uint32_t ctx_id); -struct local_i915_gem_context_param { - uint32_t context; - uint32_t size; - uint64_t param; -#define LOCAL_CONTEXT_PARAM_BAN_PERIOD 0x1 -#define LOCAL_CONTEXT_PARAM_NO_ZEROMAP 0x2 -#define LOCAL_CONTEXT_PARAM_GTT_SIZE 0x3 -#define LOCAL_CONTEXT_PARAM_NO_ERROR_CAPTURE 0x4 -#define LOCAL_CONTEXT_PARAM_BANNABLE 0x5 - uint64_t value; -}; void gem_context_require_bannable(int fd); void gem_context_require_param(int fd, uint64_t param); -void gem_context_get_param(int fd, struct local_i915_gem_context_param *p); -void gem_context_set_param(int fd, struct local_i915_gem_context_param *p); -int __gem_context_set_param(int fd, struct local_i915_gem_context_param *p); -int __gem_context_get_param(int fd, struct local_i915_gem_context_param *p); +void gem_context_get_param(int fd, struct drm_i915_gem_context_param *p); +void gem_context_set_param(int fd, struct drm_i915_gem_context_param *p); +int __gem_context_set_param(int fd, struct drm_i915_gem_context_param *p); +int __gem_context_get_param(int fd, struct drm_i915_gem_context_param *p); #define LOCAL_I915_CONTEXT_MAX_USER_PRIORITY 1023 #define LOCAL_I915_CONTEXT_DEFAULT_PRIORITY 0 |