.. | .. |
---|
49 | 49 | if (unlikely(ret)) |
---|
50 | 50 | goto err_unpin; |
---|
51 | 51 | |
---|
52 | | - if (i915_vma_is_map_and_fenceable(vma)) |
---|
| 52 | + if (i915_vma_is_map_and_fenceable(vma) && !HAS_LLC(vma->vm->i915)) |
---|
53 | 53 | addr = (void __force *)i915_vma_pin_iomap(vma); |
---|
54 | 54 | else |
---|
55 | 55 | addr = i915_gem_object_pin_map(vma->obj, |
---|
.. | .. |
---|
91 | 91 | return; |
---|
92 | 92 | |
---|
93 | 93 | i915_vma_unset_ggtt_write(vma); |
---|
94 | | - if (i915_vma_is_map_and_fenceable(vma)) |
---|
| 94 | + if (i915_vma_is_map_and_fenceable(vma) && !HAS_LLC(vma->vm->i915)) |
---|
95 | 95 | i915_vma_unpin_iomap(vma); |
---|
96 | 96 | else |
---|
97 | 97 | i915_gem_object_unpin_map(vma->obj); |
---|
.. | .. |
---|
108 | 108 | struct i915_vma *vma; |
---|
109 | 109 | |
---|
110 | 110 | obj = ERR_PTR(-ENODEV); |
---|
111 | | - if (i915_ggtt_has_aperture(ggtt)) |
---|
| 111 | + if (i915_ggtt_has_aperture(ggtt) && !HAS_LLC(i915)) |
---|
112 | 112 | obj = i915_gem_object_create_stolen(i915, size); |
---|
113 | 113 | if (IS_ERR(obj)) |
---|
114 | 114 | obj = i915_gem_object_create_internal(i915, size); |
---|