From: Marek Olšák <marek.olsak@amd.com>
Date: Tue, 27 Jun 2017 17:24:20 +0000 (+0200)
Subject: gallium/radeon: fix a possible crash for buffer exports
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e6dbe975eff8e23992c9d9a72ce302896b5fecfc;p=mesa.git

gallium/radeon: fix a possible crash for buffer exports

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c
index d68587b4a27..139ab137599 100644
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -589,16 +589,22 @@ static boolean r600_texture_get_handle(struct pipe_screen* screen,
 		res->external_usage = usage;
 	}
 
-	if (rscreen->chip_class >= GFX9) {
-		offset = rtex->surface.u.gfx9.surf_offset;
-		stride = rtex->surface.u.gfx9.surf_pitch *
-			 rtex->surface.bpe;
-		slice_size = rtex->surface.u.gfx9.surf_slice_size;
+	if (res->b.b.target == PIPE_BUFFER) {
+		offset = 0;
+		stride = 0;
+		slice_size = 0;
 	} else {
-		offset = rtex->surface.u.legacy.level[0].offset;
-		stride = rtex->surface.u.legacy.level[0].nblk_x *
-			 rtex->surface.bpe;
-		slice_size = rtex->surface.u.legacy.level[0].slice_size;
+		if (rscreen->chip_class >= GFX9) {
+			offset = rtex->surface.u.gfx9.surf_offset;
+			stride = rtex->surface.u.gfx9.surf_pitch *
+				 rtex->surface.bpe;
+			slice_size = rtex->surface.u.gfx9.surf_slice_size;
+		} else {
+			offset = rtex->surface.u.legacy.level[0].offset;
+			stride = rtex->surface.u.legacy.level[0].nblk_x *
+				 rtex->surface.bpe;
+			slice_size = rtex->surface.u.legacy.level[0].slice_size;
+		}
 	}
 	return rscreen->ws->buffer_get_handle(res->buf, stride, offset,
 					      slice_size, whandle);