From 16cc0c0eda17b2d434f793f3b52179ae2925851f Mon Sep 17 00:00:00 2001 From: Dmitry Osipenko Date: Thu, 30 Mar 2023 21:20:22 +0300 Subject: [PATCH] intel/dev: Use intel_ioctl() helper for GEM_SET_TILING MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Replace opencoded ioctl() usage with a common intel_ioctl() helper. Reviewed-by: José Roberto de Souza Signed-off-by: Dmitry Osipenko Part-of: --- src/intel/dev/i915/intel_device_info.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/intel/dev/i915/intel_device_info.c b/src/intel/dev/i915/intel_device_info.c index be6fe11..81c438f 100644 --- a/src/intel/dev/i915/intel_device_info.c +++ b/src/intel/dev/i915/intel_device_info.c @@ -419,7 +419,6 @@ static bool has_bit6_swizzle(int fd) { struct drm_gem_close close; - int ret; struct drm_i915_gem_create gem_create = { .size = 4096, @@ -435,17 +434,13 @@ has_bit6_swizzle(int fd) /* set_tiling overwrites the input on the error path, so we have to open * code intel_ioctl. */ - do { - struct drm_i915_gem_set_tiling set_tiling = { - .handle = gem_create.handle, - .tiling_mode = I915_TILING_X, - .stride = 512, - }; - - ret = ioctl(fd, DRM_IOCTL_I915_GEM_SET_TILING, &set_tiling); - } while (ret == -1 && (errno == EINTR || errno == EAGAIN)); + struct drm_i915_gem_set_tiling set_tiling = { + .handle = gem_create.handle, + .tiling_mode = I915_TILING_X, + .stride = 512, + }; - if (ret != 0) { + if (intel_ioctl(fd, DRM_IOCTL_I915_GEM_SET_TILING, &set_tiling)) { unreachable("Failed to set BO tiling"); goto close_and_return; } -- 2.7.4