geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow a buffer to point at itself and still get relocs. 

I'm using this in experiments with the i965 Mesa driver.
main
Eric Anholt 2010-06-07 14:22:36 -07:00
parent 66375fd6e8
commit f179137f8f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
intel/intel_bufmgr_gem.c
View File

@ -1316,7 +1316,10 @@ do_bo_emit_reloc(drm_intel_bo *bo, uint32_t offset,
* already been accounted for. * already been accounted for.
*/ */
assert(!bo_gem->used_as_reloc_target); assert(!bo_gem->used_as_reloc_target);
bo_gem->reloc_tree_size += target_bo_gem->reloc_tree_size; if (target_bo_gem != bo_gem) {
target_bo_gem->used_as_reloc_target = 1;
bo_gem->reloc_tree_size += target_bo_gem->reloc_tree_size;
}
/* An object needing a fence is a tiled buffer, so it won't have /* An object needing a fence is a tiled buffer, so it won't have
* relocs to other buffers. * relocs to other buffers.
*/ */
@ -1325,7 +1328,6 @@ do_bo_emit_reloc(drm_intel_bo *bo, uint32_t offset,
bo_gem->reloc_tree_fences += target_bo_gem->reloc_tree_fences; bo_gem->reloc_tree_fences += target_bo_gem->reloc_tree_fences;
/* Flag the target to disallow further relocations in it. */ /* Flag the target to disallow further relocations in it. */
target_bo_gem->used_as_reloc_target = 1;
bo_gem->relocs[bo_gem->reloc_count].offset = offset; bo_gem->relocs[bo_gem->reloc_count].offset = offset;
bo_gem->relocs[bo_gem->reloc_count].delta = target_offset; bo_gem->relocs[bo_gem->reloc_count].delta = target_offset;
@ -1387,6 +1389,9 @@ drm_intel_gem_bo_process_reloc(drm_intel_bo *bo)
for (i = 0; i < bo_gem->reloc_count; i++) { for (i = 0; i < bo_gem->reloc_count; i++) {
drm_intel_bo *target_bo = bo_gem->reloc_target_info[i].bo; drm_intel_bo *target_bo = bo_gem->reloc_target_info[i].bo;
if (target_bo == bo)
continue;
/* Continue walking the tree depth-first. */ /* Continue walking the tree depth-first. */
drm_intel_gem_bo_process_reloc(target_bo); drm_intel_gem_bo_process_reloc(target_bo);
@ -1408,6 +1413,9 @@ drm_intel_gem_bo_process_reloc2(drm_intel_bo *bo)
drm_intel_bo *target_bo = bo_gem->reloc_target_info[i].bo; drm_intel_bo *target_bo = bo_gem->reloc_target_info[i].bo;
int need_fence; int need_fence;
if (target_bo == bo)
continue;
/* Continue walking the tree depth-first. */ /* Continue walking the tree depth-first. */
drm_intel_gem_bo_process_reloc2(target_bo); drm_intel_gem_bo_process_reloc2(target_bo);