* [PATCH libdrm] intel: Restore formatting of offsets in debug statements
@ 2015-12-15 15:28 Michał Winiarski
2015-12-22 9:56 ` Kenneth Graunke
0 siblings, 1 reply; 2+ messages in thread
From: Michał Winiarski @ 2015-12-15 15:28 UTC (permalink / raw)
To: intel-gfx; +Cc: Kristian Høgsberg Kristensen
Using lower_32_bits and upper_32_bits macros was accidentally dropped in:
commit 8b4d57e7b75cb0bd01d11ad7f597909034a316aa
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.
Cc: Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
---
intel/intel_bufmgr_gem.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 265516f..dc28200 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -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_bo;
- DBG("%2d: %d %s(%s)@0x%016llx -> "
- "%d (%s)@0x%016llx + 0x%08x\n",
+ DBG("%2d: %d %s(%s)@0x%08x %08x -> "
+ "%d (%s)@0x%08x %08x + 0x%08x\n",
i,
bo_gem->gem_handle,
bo_gem->is_softpin ? "*" : "",
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->name,
- (unsigned long long) target_bo->offset64,
+ upper_32_bits(target_bo->offset64),
+ lower_32_bits(target_bo->offset64),
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_bo;
DBG("%2d: %d %s(%s) -> "
- "%d *(%s)@0x%016lx\n",
+ "%d *(%s)@0x%08x %08x\n",
i,
bo_gem->gem_handle,
bo_gem->is_softpin ? "*" : "",
bo_gem->name,
target_gem->gem_handle,
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
*/
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,
- (unsigned long long) bo->offset64,
- (unsigned long long) bufmgr_gem->exec2_objects[i].offset);
+ upper_32_bits(bo->offset64),
+ 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->offset = bufmgr_gem->exec2_objects[i].offset;
}
--
2.5.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH libdrm] intel: Restore formatting of offsets in debug statements
2015-12-15 15:28 [PATCH libdrm] intel: Restore formatting of offsets in debug statements Michał Winiarski
@ 2015-12-22 9:56 ` Kenneth Graunke
0 siblings, 0 replies; 2+ messages in thread
From: Kenneth Graunke @ 2015-12-22 9:56 UTC (permalink / raw)
To: intel-gfx; +Cc: Kristian Høgsberg Kristensen
[-- Attachment #1.1: Type: text/plain, Size: 726 bytes --]
On Tuesday, December 15, 2015 4:28:55 PM PST Michał Winiarski
wrote:
> Using lower_32_bits and upper_32_bits macros was accidentally
dropped in:
>
> commit 8b4d57e7b75cb0bd01d11ad7f597909034a316aa
> 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.
>
> Cc: Kristian Høgsberg Kristensen
<kristian.h.kristensen@intel.com>
> Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
> ---
> intel/intel_bufmgr_gem.c | 23 ++++++++++++++---------
> 1 file changed, 14 insertions(+), 9 deletions(-)
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
[-- Attachment #1.2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-22 10:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-15 15:28 [PATCH libdrm] intel: Restore formatting of offsets in debug statements Michał Winiarski
2015-12-22 9:56 ` Kenneth Graunke
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.