hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/drivers/gpu/drm/i915/gem/i915_gem_tiling.c
....@@ -296,10 +296,6 @@
296296 spin_unlock(&obj->vma.lock);
297297
298298 obj->tiling_and_stride = tiling | stride;
299
- i915_gem_object_unlock(obj);
300
-
301
- /* Force the fence to be reacquired for GTT access */
302
- i915_gem_object_release_mmap_gtt(obj);
303299
304300 /* Try to preallocate memory required to save swizzling on put-pages */
305301 if (i915_gem_object_needs_bit17_swizzle(obj)) {
....@@ -312,6 +308,11 @@
312308 obj->bit_17 = NULL;
313309 }
314310
311
+ i915_gem_object_unlock(obj);
312
+
313
+ /* Force the fence to be reacquired for GTT access */
314
+ i915_gem_object_release_mmap_gtt(obj);
315
+
315316 return 0;
316317 }
317318