gallium/radeon: store VM address in r600_resource

This will help to get rid of the buffer_get_virtual_address calls.

Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c
index d747cbcb930f75d9c76f5cf900066fee98562a8d..a5806851bf32be21580812d38b37ea1818713a08 100644 (file)
--- a/src/gallium/drivers/radeon/r600_buffer_common.c
+++ b/src/gallium/drivers/radeon/r600_buffer_common.c
@@ -168,14 +168,17 @@ bool r600_init_resource(struct r600_common_screen *rscreen,
        old_buf = res->buf;
        res->cs_buf = rscreen->ws->buffer_get_cs_handle(new_buf); /* should be atomic */
        res->buf = new_buf; /* should be atomic */
+
+       if (rscreen->info.r600_virtual_address)
+               res->gpu_address = rscreen->ws->buffer_get_virtual_address(res->cs_buf);
+
        pb_reference(&old_buf, NULL);
 
        util_range_set_empty(&res->valid_buffer_range);
 
        if (rscreen->debug_flags & DBG_VM && res->b.b.target == PIPE_BUFFER) {
                fprintf(stderr, "VM start=0x%"PRIX64"  end=0x%"PRIX64" | Buffer %u bytes\n",
-                       r600_resource_va(&rscreen->b, &res->b.b),
-                       r600_resource_va(&rscreen->b, &res->b.b) + res->buf->size,
+                       res->gpu_address, res->gpu_address + res->buf->size,
                        res->buf->size);
        }
        return true;

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index ac69d5b8746795675a449cc91f1d37175cf1746a..59d0b3e21c40589beaf7d9f1ffa9899e40b33b50 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -127,6 +127,7 @@ struct r600_resource {
        /* Winsys objects. */
        struct pb_buffer                *buf;
        struct radeon_winsys_cs_handle  *cs_buf;
+       uint64_t                        gpu_address;
 
        /* Resource state. */
        enum radeon_bo_domain           domains;

diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c
index 482bbff4e63bcac7f39e67c17bfe6c4bea5ea844..326aca4e09b58286b6865940cb7f1026bbdf8d5a 100644 (file)
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -655,6 +655,7 @@ r600_texture_create_object(struct pipe_screen *screen,
        } else {
                resource->buf = buf;
                resource->cs_buf = rscreen->ws->buffer_get_cs_handle(buf);
+               resource->gpu_address = rscreen->ws->buffer_get_virtual_address(resource->cs_buf);
                resource->domains = rscreen->ws->buffer_get_initial_domain(resource->cs_buf);
        }