.. | .. |
---|
296 | 296 | spin_unlock(&obj->vma.lock); |
---|
297 | 297 | |
---|
298 | 298 | 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); |
---|
303 | 299 | |
---|
304 | 300 | /* Try to preallocate memory required to save swizzling on put-pages */ |
---|
305 | 301 | if (i915_gem_object_needs_bit17_swizzle(obj)) { |
---|
.. | .. |
---|
312 | 308 | obj->bit_17 = NULL; |
---|
313 | 309 | } |
---|
314 | 310 | |
---|
| 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 | + |
---|
315 | 316 | return 0; |
---|
316 | 317 | } |
---|
317 | 318 | |
---|