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

intel: Restore formatting of offsets in debug statements 

Using lower_32_bits and upper_32_bits macros was accidentally dropped in:

    commit 8b4d57e7b7
    Author: Michał Winiarski <michal.winiarski@intel.com>
    Date:   Wed Sep 9 16:07:10 2015 +0200

	intel: Add support for softpin

Let's restore previous, more readable format.

Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
main
Michał Winiarski 2015-12-15 16:28:55 +01:00 committed by Kenneth Graunke
parent f49bfd98b3
commit b38a4b2326
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
intel/intel_bufmgr_gem.c
View File

@ -438,16 +438,18 @@ drm_intel_gem_dump_validation_list(drm_intel_bufmgr_gem *bufmgr_gem)
drm_intel_bo_gem *target_gem = drm_intel_bo_gem *target_gem =
(drm_intel_bo_gem *) target_bo; (drm_intel_bo_gem *) target_bo;
DBG("%2d: %d %s(%s)@0x%016llx -> " DBG("%2d: %d %s(%s)@0x%08x %08x -> "
"%d (%s)@0x%016llx + 0x%08x\n", "%d (%s)@0x%08x %08x + 0x%08x\n",
i, i,
bo_gem->gem_handle, bo_gem->gem_handle,
bo_gem->is_softpin ? "*" : "", bo_gem->is_softpin ? "*" : "",
bo_gem->name, bo_gem->name,
(unsigned long long) bo_gem->relocs[j].offset, upper_32_bits(bo_gem->relocs[j].offset),
lower_32_bits(bo_gem->relocs[j].offset),
target_gem->gem_handle, target_gem->gem_handle,
target_gem->name, target_gem->name,
(unsigned long long) target_bo->offset64, upper_32_bits(target_bo->offset64),
lower_32_bits(target_bo->offset64),
bo_gem->relocs[j].delta); bo_gem->relocs[j].delta);
} }
@ -456,14 +458,15 @@ drm_intel_gem_dump_validation_list(drm_intel_bufmgr_gem *bufmgr_gem)
drm_intel_bo_gem *target_gem = drm_intel_bo_gem *target_gem =
(drm_intel_bo_gem *) target_bo; (drm_intel_bo_gem *) target_bo;
DBG("%2d: %d %s(%s) -> " DBG("%2d: %d %s(%s) -> "
"%d *(%s)@0x%016lx\n", "%d *(%s)@0x%08x %08x\n",
i, i,
bo_gem->gem_handle, bo_gem->gem_handle,
bo_gem->is_softpin ? "*" : "", bo_gem->is_softpin ? "*" : "",
bo_gem->name, bo_gem->name,
target_gem->gem_handle, target_gem->gem_handle,
target_gem->name, target_gem->name,
target_bo->offset64); upper_32_bits(target_bo->offset64),
lower_32_bits(target_bo->offset64));
} }
} }
} }
@ -2242,10 +2245,12 @@ drm_intel_update_buffer_offsets2 (drm_intel_bufmgr_gem *bufmgr_gem)
* has relocated our object... Indicating a programming error * has relocated our object... Indicating a programming error
*/ */
assert(!bo_gem->is_softpin); assert(!bo_gem->is_softpin);
DBG("BO %d (%s) migrated: 0x%016llx -> 0x%016llx\n", DBG("BO %d (%s) migrated: 0x%08x %08x -> 0x%08x %08x\n",
bo_gem->gem_handle, bo_gem->name, bo_gem->gem_handle, bo_gem->name,
(unsigned long long) bo->offset64, upper_32_bits(bo->offset64),
(unsigned long long) bufmgr_gem->exec2_objects[i].offset); lower_32_bits(bo->offset64),
upper_32_bits(bufmgr_gem->exec2_objects[i].offset),
lower_32_bits(bufmgr_gem->exec2_objects[i].offset));
bo->offset64 = bufmgr_gem->exec2_objects[i].offset; bo->offset64 = bufmgr_gem->exec2_objects[i].offset;
bo->offset = bufmgr_gem->exec2_objects[i].offset; bo->offset = bufmgr_gem->exec2_objects[i].offset;
} }