NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

anv/sparse: drop anv_sparse_binding_data from dump_anv_vm_bind()

Browse source 
Having it helped us printing the resource offset, which made debugging
some situations easier. The problem is that we want to rework the code
a little bit and we won't have a 'sparse' struct anymore to pass
around. Since it's all debug code drop it for now so it doesn't get in
the way of the rework. If we need it later we can find a way to add it
back, or we find another way to print the value.

Drive-by drop the DEBUG_SPARSE check that's already in the caller.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25512>
This commit is contained in:
Paulo Zanoni 2023-10-16 17:32:24 -07:00 • committed by Marge Bot
parent b4fef9a745
commit 11e9a700f6
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/intel/vulkan/anv_sparse.c
View file

@ -50,22 +50,17 @@ sparse_debug(const char *format, ...)
static void
dump_anv_vm_bind(struct anv_device *device,
struct anv_sparse_binding_data *sparse,
const struct anv_vm_bind *bind)
{
if (!INTEL_DEBUG(DEBUG_SPARSE))
return;
sparse_debug("[%s] ", bind->op == ANV_VM_BIND ? " bind " : "unbind");
if (bind->bo)
sparse_debug("bo:%04u ", bind->bo->gem_handle);
else
sparse_debug("bo:---- ");
sparse_debug("res_offset:%08"PRIx64" size:%08"PRIx64" "
"mem_offset:%08"PRIx64" addr:%016"PRIx64"\n",
bind->address - sparse->address, bind->size,
bind->bo_offset, bind->address);
sparse_debug("address:%016"PRIx64" size:%08"PRIx64" "
"mem_offset:%08"PRIx64"\n",
bind->address, bind->size, bind->bo_offset);
}
static void
@ -564,12 +559,11 @@ anv_sparse_bind_vm_bind(struct anv_device *device, int num_binds,
static VkResult
anv_sparse_bind(struct anv_device *device,
struct anv_sparse_binding_data *sparse,
int num_binds, struct anv_vm_bind *binds)
{
if (INTEL_DEBUG(DEBUG_SPARSE)) {
for (int b = 0; b < num_binds; b++)
dump_anv_vm_bind(device, sparse, &binds[b]);
dump_anv_vm_bind(device, &binds[b]);
}
return device->physical->sparse_uses_trtt ?
@ -607,7 +601,7 @@ anv_init_sparse_bindings(struct anv_device *device,
.op = ANV_VM_BIND,
};
VkResult res = anv_sparse_bind(device, sparse, 1, &bind);
VkResult res = anv_sparse_bind(device, 1, &bind);
if (res != VK_SUCCESS) {
anv_vma_free(device, sparse->vma_heap, sparse->address, sparse->size);
return res;
@ -633,7 +627,7 @@ anv_free_sparse_bindings(struct anv_device *device,
.size = sparse->size,
.op = ANV_VM_UNBIND,
};
VkResult res = anv_sparse_bind(device, sparse, 1, &unbind);
VkResult res = anv_sparse_bind(device, 1, &unbind);
if (res != VK_SUCCESS)
return res;
@ -878,7 +872,7 @@ anv_sparse_bind_resource_memory(struct anv_device *device,
{
struct anv_vm_bind bind = vk_bind_to_anv_vm_bind(sparse, vk_bind);
return anv_sparse_bind(device, sparse, 1, &bind);
return anv_sparse_bind(device, 1, &bind);
}
VkResult
@ -1020,7 +1014,7 @@ anv_sparse_bind_image_memory(struct anv_queue *queue,
}
}
ret = anv_sparse_bind(device, sparse_data, num_binds, binds);
ret = anv_sparse_bind(device, num_binds, binds);
STACK_ARRAY_FINISH(binds);