apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Kill obj->gtt_offset

Browse Source 
With the getters in place from the previous patch this members serves no
purpose other than saving one spare pointer chase, which will be killed
in the next patch anyway.

Moving to VMAs, this members adds unnecessary confusion since an object
may exist at different offsets in different VMs.

v2: Properly preserve the stolen offset. This code is a bit hacky but it
all goes away when we embed the drm_mm_node and removes the need for the
incorrect patch I submitted previously: "Use gtt_space->start for stolen
reservation"

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ben Widawsky
2013-07-05 14:41:05 -07:00
committed by Daniel Vetter
parent f343c5f647
commit edd41a870f
4 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/drm/i915/i915_gem_gtt.c
+8 -6
View File
@@ -629,18 +629,20 @@ void i915_gem_setup_global_gtt(struct drm_device *dev,
/* Mark any preallocated objects as occupied */
list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) {
uintptr_t offset = (uintptr_t) obj->gtt_space;
int ret;
DRM_DEBUG_KMS("reserving preallocated space: %x + %zx\n",
obj->gtt_offset, obj->base.size);
DRM_DEBUG_KMS("reserving preallocated space: %lx + %zx\n",
offset, obj->base.size);
BUG_ON(obj->gtt_space != I915_GTT_RESERVED);
BUG_ON((offset & I915_GTT_RESERVED) != 0);
offset &= ~I915_GTT_RESERVED;
obj->gtt_space = kzalloc(sizeof(*obj->gtt_space), GFP_KERNEL);
if (!obj->gtt_space) {
DRM_ERROR("Failed to preserve object at offset %x\n",
obj->gtt_offset);
DRM_ERROR("Failed to preserve object at offset %lx\n",
offset);
continue;
}
obj->gtt_space->start = obj->gtt_offset;
obj->gtt_space->start = (unsigned long)offset;
obj->gtt_space->size = obj->base.size;
ret = drm_mm_reserve_node(&dev_priv->mm.gtt_space,
obj->gtt_space);