hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/drivers/gpu/drm/i915/gt/intel_ring.c
....@@ -49,7 +49,7 @@
4949 if (unlikely(ret))
5050 goto err_unpin;
5151
52
- if (i915_vma_is_map_and_fenceable(vma))
52
+ if (i915_vma_is_map_and_fenceable(vma) && !HAS_LLC(vma->vm->i915))
5353 addr = (void __force *)i915_vma_pin_iomap(vma);
5454 else
5555 addr = i915_gem_object_pin_map(vma->obj,
....@@ -91,7 +91,7 @@
9191 return;
9292
9393 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))
9595 i915_vma_unpin_iomap(vma);
9696 else
9797 i915_gem_object_unpin_map(vma->obj);
....@@ -108,7 +108,7 @@
108108 struct i915_vma *vma;
109109
110110 obj = ERR_PTR(-ENODEV);
111
- if (i915_ggtt_has_aperture(ggtt))
111
+ if (i915_ggtt_has_aperture(ggtt) && !HAS_LLC(i915))
112112 obj = i915_gem_object_create_stolen(i915, size);
113113 if (IS_ERR(obj))
114114 obj = i915_gem_object_create_internal(i915, size);