summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/radeonsi
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2018-02-22 00:28:39 +0100
committerMarek Olšák <[email protected]>2018-03-07 13:55:40 -0500
commit9b554980591251a37d4473b4d1c951362473a129 (patch)
treecd11de4d890646938a483c9463d181c4e03ce09f /src/gallium/drivers/radeonsi
parent2a47660754ba49d5998929550f639677506c4515 (diff)
radeonsi: properly extract a buffer address from a descriptor
Diffstat (limited to 'src/gallium/drivers/radeonsi')
-rw-r--r--src/gallium/drivers/radeonsi/si_descriptors.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
index e6c58ffca78..b6e767c2546 100644
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -96,7 +96,13 @@ static uint32_t null_image_descriptor[8] = {
static uint64_t si_desc_extract_buffer_address(uint32_t *desc)
{
- return desc[0] | ((uint64_t)G_008F04_BASE_ADDRESS_HI(desc[1]) << 32);
+ uint64_t va = desc[0] |
+ ((uint64_t)G_008F04_BASE_ADDRESS_HI(desc[1]) << 32);
+
+ /* Sign-extend the 48-bit address. */
+ if (va & (1ull << 47))
+ va |= 0xffffull << 48;
+ return va;
}
static void si_init_descriptor_list(uint32_t *desc_list,