Module Name: xsrc
Committed By: joerg
Date: Wed May 7 21:24:25 UTC 2014
Modified Files:
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
Log Message:
Fix format strings.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
diff -u xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c:1.7 xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c:1.8
--- xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c:1.7 Fri Mar 21 18:11:21 2014
+++ xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c Wed May 7 21:24:25 2014
@@ -386,13 +386,13 @@ drm_intel_gem_dump_validation_list(drm_i
(drm_intel_bo_gem *) target_bo;
DBG("%2d: %d (%s)@0x%08llx -> "
- "%d (%s)@0x%08lx + 0x%08x\n",
+ "%d (%s)@0x%08llx + 0x%08x\n",
i,
bo_gem->gem_handle, bo_gem->name,
(unsigned long long)bo_gem->relocs[j].offset,
target_gem->gem_handle,
target_gem->name,
- target_bo->offset64,
+ (unsigned long long)target_bo->offset64,
bo_gem->relocs[j].delta);
}
}
@@ -1858,8 +1858,9 @@ drm_intel_update_buffer_offsets(drm_inte
/* Update the buffer offset */
if (bufmgr_gem->exec_objects[i].offset != bo->offset64) {
- DBG("BO %d (%s) migrated: 0x%08lx -> 0x%08llx\n",
- bo_gem->gem_handle, bo_gem->name, bo->offset64,
+ DBG("BO %d (%s) migrated: 0x%08llx -> 0x%08llx\n",
+ bo_gem->gem_handle, bo_gem->name,
+ (unsigned long long)bo->offset64,
(unsigned long long)bufmgr_gem->exec_objects[i].
offset);
bo->offset64 = bufmgr_gem->exec_objects[i].offset;
@@ -1879,8 +1880,9 @@ drm_intel_update_buffer_offsets2 (drm_in
/* Update the buffer offset */
if (bufmgr_gem->exec2_objects[i].offset != bo->offset64) {
- DBG("BO %d (%s) migrated: 0x%08lx -> 0x%08llx\n",
- bo_gem->gem_handle, bo_gem->name, bo->offset64,
+ DBG("BO %d (%s) migrated: 0x%08llx -> 0x%08llx\n",
+ bo_gem->gem_handle, bo_gem->name,
+ (unsigned long long)bo->offset64,
(unsigned long long)bufmgr_gem->exec2_objects[i].offset);
bo->offset64 = bufmgr_gem->exec2_objects[i].offset;
bo->offset = bufmgr_gem->exec2_objects[i].offset;
