diff options
| author | ranjeet kumar <ranjeet1.kumar@intel.com> | 2020-04-28 19:01:41 +0530 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-05-11 20:16:27 +0100 |
| commit | 22d0955e019020f9ecda4124707801214e279a0c (patch) | |
| tree | 6f43a7cc405399eb892e905bae59311f9f0ab8ae /lib | |
| parent | 5a5a3162a7638b3ae38b6dc2545622c204d1b97c (diff) | |
Macros fixes: Removed unused & redundant macros
Local macros were declared in several files as a prelude to upstream
implementations. Now that we ship include/drm-uapi, we can remove LOCAL
as we upstream.
Cc: Dixit, Ashutosh <ashutosh.dixit@intel.com>
Cc: Tahvanainen Jari <jari.tahvanainen@intel.com>
Signed-off-by: ranjeet kumar <ranjeet1.kumar@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/i915/gem_context.h | 3 | ||||
| -rw-r--r-- | lib/i915/gem_scheduler.c | 4 | ||||
| -rw-r--r-- | lib/igt_dummyload.c | 5 | ||||
| -rw-r--r-- | lib/ioctl_wrappers.h | 10 |
4 files changed, 2 insertions, 20 deletions
diff --git a/lib/i915/gem_context.h b/lib/i915/gem_context.h index b478c47a..c34ab213 100644 --- a/lib/i915/gem_context.h +++ b/lib/i915/gem_context.h @@ -65,9 +65,6 @@ 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 -#define LOCAL_I915_CONTEXT_MIN_USER_PRIORITY -1023 int __gem_context_set_priority(int fd, uint32_t ctx, int prio); void gem_context_set_priority(int fd, uint32_t ctx, int prio); diff --git a/lib/i915/gem_scheduler.c b/lib/i915/gem_scheduler.c index 1beb85de..184da843 100644 --- a/lib/i915/gem_scheduler.c +++ b/lib/i915/gem_scheduler.c @@ -30,8 +30,6 @@ #include "i915/gem_scheduler.h" -#define LOCAL_I915_PARAM_HAS_SCHEDULER 41 - /** * SECTION:gem_scheduler * @short_description: Helpers for querying scheduler capabilities @@ -55,7 +53,7 @@ unsigned gem_scheduler_capability(int fd) struct drm_i915_getparam gp; memset(&gp, 0, sizeof(gp)); - gp.param = LOCAL_I915_PARAM_HAS_SCHEDULER; + gp.param = I915_PARAM_HAS_SCHEDULER; gp.value = ∩︀ caps = 0; diff --git a/lib/igt_dummyload.c b/lib/igt_dummyload.c index d4cc9be6..0b52eb5b 100644 --- a/lib/igt_dummyload.c +++ b/lib/igt_dummyload.c @@ -58,10 +58,7 @@ * consume exactly a specific amount of time. */ -#define LOCAL_I915_EXEC_BSD_SHIFT (13) -#define LOCAL_I915_EXEC_BSD_MASK (3 << LOCAL_I915_EXEC_BSD_SHIFT) - -#define ENGINE_MASK (I915_EXEC_RING_MASK | LOCAL_I915_EXEC_BSD_MASK) +#define ENGINE_MASK (I915_EXEC_RING_MASK | I915_EXEC_BSD_MASK) #define MI_ARB_CHK (0x5 << 23) diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h index 9f1f5c5c..435fc813 100644 --- a/lib/ioctl_wrappers.h +++ b/lib/ioctl_wrappers.h @@ -102,16 +102,6 @@ int __gem_execbuf(int fd, struct drm_i915_gem_execbuffer2 *execbuf); int gem_madvise(int fd, uint32_t handle, int state); -#define LOCAL_I915_GEM_USERPTR 0x33 -#define LOCAL_IOCTL_I915_GEM_USERPTR DRM_IOWR (DRM_COMMAND_BASE + LOCAL_I915_GEM_USERPTR, struct local_i915_gem_userptr) -struct local_i915_gem_userptr { - uint64_t user_ptr; - uint64_t user_size; - uint32_t flags; -#define LOCAL_I915_USERPTR_READ_ONLY (1<<0) -#define LOCAL_I915_USERPTR_UNSYNCHRONIZED (1<<31) - uint32_t handle; -}; void gem_userptr(int fd, void *ptr, uint64_t size, int read_only, uint32_t flags, uint32_t *handle); int __gem_userptr(int fd, void *ptr, uint64_t size, int read_only, uint32_t flags, uint32_t *handle); |