From 2d3c1707fa571b0632daf7725aff3a76a27f7d91 Mon Sep 17 00:00:00 2001 From: Dmitry Osipenko Date: Sat, 14 Jan 2023 22:00:25 +0300 Subject: [PATCH] iris/bufmgr: 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/gallium/drivers/iris/iris_bufmgr.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c index 97ab34b..db32d86 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.c +++ b/src/gallium/drivers/iris/iris_bufmgr.c @@ -1825,15 +1825,13 @@ iris_gem_set_tiling(struct iris_bo *bo, const struct isl_surf *surf) /* GEM_SET_TILING is slightly broken and 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 = bo->gem_handle, - .tiling_mode = tiling_mode, - .stride = surf->row_pitch_B, - }; - ret = ioctl(bufmgr->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 = bo->gem_handle, + .tiling_mode = tiling_mode, + .stride = surf->row_pitch_B, + }; + ret = intel_ioctl(bufmgr->fd, DRM_IOCTL_I915_GEM_SET_TILING, &set_tiling); if (ret) { DBG("gem_set_tiling failed for BO %u: %s\n", bo->gem_handle, strerror(errno)); -- 2.7.4