diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c
index daf67101be3..64dd73adaaa 100644
--- a/src/gallium/drivers/iris/iris_bufmgr.c
+++ b/src/gallium/drivers/iris/iris_bufmgr.c
@@ -376,6 +376,7 @@ bo_alloc_internal(struct iris_bufmgr *bufmgr,
    bool alloc_from_cache;
    uint64_t bo_size;
    bool zeroed = false;
+   bool alloc_pages = false;
 
    if (flags & BO_ALLOC_ZEROED)
       zeroed = true;
@@ -413,11 +414,6 @@ retry:
             goto retry;
          }
 
-         if (bo_set_tiling_internal(bo, tiling_mode, stride)) {
-            bo_free(bo);
-            goto retry;
-         }
-
          if (zeroed) {
             void *map = iris_bo_map(NULL, bo, MAP_WRITE | MAP_RAW);
             if (!map) {
@@ -464,21 +460,7 @@ retry:
       bo->swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
       bo->stride = 0;
 
-      if (bo_set_tiling_internal(bo, tiling_mode, stride))
-         goto err_free;
-
-      /* Calling set_domain() will allocate pages for the BO outside of the
-       * struct mutex lock in the kernel, which is more efficient than waiting
-       * to create them during the first execbuf that uses the BO.
-       */
-      struct drm_i915_gem_set_domain sd = {
-         .handle = bo->gem_handle,
-         .read_domains = I915_GEM_DOMAIN_CPU,
-         .write_domain = 0,
-      };
-
-      if (drm_ioctl(bo->bufmgr->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &sd) != 0)
-         goto err_free;
+      alloc_pages = true;
    }
 
    bo->name = name;
@@ -501,6 +483,24 @@ retry:
          goto err_free;
    }
 
+   if (bo_set_tiling_internal(bo, tiling_mode, stride))
+      goto err_free;
+
+   if (alloc_pages) {
+      /* Calling set_domain() will allocate pages for the BO outside of the
+       * struct mutex lock in the kernel, which is more efficient than waiting
+       * to create them during the first execbuf that uses the BO.
+       */
+      struct drm_i915_gem_set_domain sd = {
+         .handle = bo->gem_handle,
+         .read_domains = I915_GEM_DOMAIN_CPU,
+         .write_domain = 0,
+      };
+
+      if (drm_ioctl(bo->bufmgr->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &sd) != 0)
+         goto err_free;
+   }
+
    mtx_unlock(&bufmgr->lock);
 
    if ((flags & BO_ALLOC_COHERENT) && !bo->cache_coherent) {