From: Marek Olšák <marek.olsak@amd.com>
Date: Wed, 21 Feb 2018 23:28:39 +0000 (+0100)
Subject: radeonsi: properly extract a buffer address from a descriptor
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9b554980591251a37d4473b4d1c951362473a129;p=mesa.git

radeonsi: properly extract a buffer address from a descriptor
---

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,