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 /tests/i915/gem_shrink.c | |
| 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 'tests/i915/gem_shrink.c')
| -rw-r--r-- | tests/i915/gem_shrink.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/i915/gem_shrink.c b/tests/i915/gem_shrink.c index 10d63942..5715ef68 100644 --- a/tests/i915/gem_shrink.c +++ b/tests/i915/gem_shrink.c @@ -225,7 +225,7 @@ static void hang(int fd, uint64_t alloc) static void userptr(int fd, uint64_t alloc, unsigned int flags) #define UDIRTY (1 << 0) { - struct local_i915_gem_userptr userptr; + struct drm_i915_gem_userptr userptr; void *ptr; igt_assert((alloc & 4095) == 0); @@ -238,7 +238,7 @@ static void userptr(int fd, uint64_t alloc, unsigned int flags) memset(&userptr, 0, sizeof(userptr)); userptr.user_size = alloc; userptr.user_ptr = to_user_pointer(ptr); - do_ioctl(fd, LOCAL_IOCTL_I915_GEM_USERPTR, &userptr); + do_ioctl(fd, DRM_IOCTL_I915_GEM_USERPTR, &userptr); if (flags & UDIRTY) gem_set_domain(fd, userptr.handle, @@ -251,7 +251,7 @@ static void userptr(int fd, uint64_t alloc, unsigned int flags) static bool has_userptr(void) { - struct local_i915_gem_userptr userptr; + struct drm_i915_gem_userptr userptr; int fd = drm_open_driver(DRIVER_INTEL); int err; @@ -260,7 +260,7 @@ static bool has_userptr(void) userptr.user_ptr = -4096; err = 0; - if (drmIoctl(fd, LOCAL_IOCTL_I915_GEM_USERPTR, &userptr)) + if (drmIoctl(fd, DRM_IOCTL_I915_GEM_USERPTR, &userptr)) err = errno; close(fd); |