Commit b53c8c35 authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter

drm/i915: drop duplicate ggtt vma list add in setup_global_gtt

Preallocated objects will already have been added to the vma_list when
creating their ggtt vma entry, and coincidentally also marked as holding
a ggtt mapping. Repeating the vma_list manipulation when setting up the
ggtt after preallocation is a recipe for an unhappy kernel.
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
[danvet: Use the improve commit message suggest by Chris.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b6359918
...@@ -759,7 +759,6 @@ void i915_gem_setup_global_gtt(struct drm_device *dev, ...@@ -759,7 +759,6 @@ void i915_gem_setup_global_gtt(struct drm_device *dev,
if (ret) if (ret)
DRM_DEBUG_KMS("Reservation failed\n"); DRM_DEBUG_KMS("Reservation failed\n");
obj->has_global_gtt_mapping = 1; obj->has_global_gtt_mapping = 1;
list_add(&vma->vma_link, &obj->vma_list);
} }
dev_priv->gtt.base.start = start; dev_priv->gtt.base.start = start;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment