fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: add/update assertions for 32-bit address space

Browse source
This commit is contained in:
Marek Olšák 2018-02-22 17:13:51 +01:00
parent 16856a1ee8
commit 53db2790c0
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gallium/drivers/radeon/r600_buffer_common.c
View file

@ -218,10 +218,21 @@ bool si_alloc_resource(struct si_screen *sscreen,
old_buf = res->buf;
res->buf = new_buf; /* should be atomic */
if (sscreen->info.has_virtual_memory)
if (sscreen->info.has_virtual_memory) {
res->gpu_address = sscreen->ws->buffer_get_virtual_address(res->buf);
else
if (res->flags & RADEON_FLAG_32BIT) {
uint64_t start = res->gpu_address;
uint64_t last = start + res->bo_size - 1;
(void)start;
(void)last;
assert((start >> 32) == sscreen->info.address32_hi);
assert((last >> 32) == sscreen->info.address32_hi);
}
} else {
res->gpu_address = 0;
}
pb_reference(&old_buf, NULL);

6
src/gallium/drivers/radeonsi/si_descriptors.c
View file

@ -188,6 +188,10 @@ static bool si_upload_descriptors(struct si_context *sctx,
buffer_offset -= first_slot_offset;
desc->gpu_address = desc->buffer->gpu_address + buffer_offset;
assert(desc->buffer->flags & RADEON_FLAG_32BIT);
assert((desc->buffer->gpu_address >> 32) == sctx->screen->info.address32_hi);
assert((desc->gpu_address >> 32) == sctx->screen->info.address32_hi);
si_mark_atom_dirty(sctx, &sctx->shader_pointers.atom);
return true;
}
@ -2016,7 +2020,7 @@ static void si_emit_shader_pointer_body(struct si_screen *sscreen,
radeon_emit(cs, va);
if (HAVE_32BIT_POINTERS)
assert((va >> 32) == sscreen->info.address32_hi);
assert(va == 0 || (va >> 32) == sscreen->info.address32_hi);
else
radeon_emit(cs, va >> 32);
}