diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-01-11 13:56:17 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-01-11 14:02:54 +0000 |
| commit | 805a99409542d7d72dda3b6dcd284a8869a3de16 (patch) | |
| tree | 6d75843858cfbe2db50e29f97ae717d725cb3795 /tests/i915/gem_tiled_wc.c | |
| parent | 8777af494f5f078f16bca0a2130532beac0a56df (diff) | |
i915/gem_tiled_wc: Reuse common gem_get_tiling
get_tiling == gem_get_tiling + igt_require; so do that instead of
opencoding the ioctl.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'tests/i915/gem_tiled_wc.c')
| -rw-r--r-- | tests/i915/gem_tiled_wc.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/tests/i915/gem_tiled_wc.c b/tests/i915/gem_tiled_wc.c index 65ac3851..21390729 100644 --- a/tests/i915/gem_tiled_wc.c +++ b/tests/i915/gem_tiled_wc.c @@ -104,27 +104,6 @@ calculate_expected(int offset) return (base_y + tile_y) * WIDTH + base_x + tile_x; } -static void -get_tiling(int fd, uint32_t handle, uint32_t *tiling, uint32_t *swizzle) -{ - struct drm_i915_gem_get_tiling2 { - uint32_t handle; - uint32_t tiling_mode; - uint32_t swizzle_mode; - uint32_t phys_swizzle_mode; - } arg; -#define DRM_IOCTL_I915_GEM_GET_TILING2 DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_TILING, struct drm_i915_gem_get_tiling2) - - memset(&arg, 0, sizeof(arg)); - arg.handle = handle; - - do_ioctl(fd, DRM_IOCTL_I915_GEM_GET_TILING2, &arg); - igt_require(arg.phys_swizzle_mode == arg.swizzle_mode); - - *tiling = arg.tiling_mode; - *swizzle = arg.swizzle_mode; -} - igt_simple_main { int fd; @@ -136,7 +115,7 @@ igt_simple_main gem_require_mmap_wc(fd); handle = create_bo(fd); - get_tiling(fd, handle, &tiling, &swizzle); + igt_require(gem_get_tiling(fd, handle, &tiling, &swizzle)); if (IS_GEN2(intel_get_drm_devid(fd))) { tile_height = 16; |