From: Marek Olšák <marek.olsak@amd.com>
Date: Thu, 10 Sep 2015 16:15:40 +0000 (+0200)
Subject: radeonsi: report alloc failure from si_shader_binary_read
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=394d67a58f949245e8b3fad400e9efaa5829ec84;p=mesa.git

radeonsi: report alloc failure from si_shader_binary_read

Cc: 11.0 <mesa-stable@lists.freedesktop.org>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 2e49a215763..a3df64824c6 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -3774,11 +3774,14 @@ int si_shader_binary_read(struct si_screen *sscreen, struct si_shader *shader)
 {
 	const struct radeon_shader_binary *binary = &shader->binary;
 	unsigned i;
+	int r;
 	bool dump  = r600_can_dump_shader(&sscreen->b,
 		shader->selector ? shader->selector->tokens : NULL);
 
 	si_shader_binary_read_config(sscreen, shader, 0);
-	si_shader_binary_upload(sscreen, shader);
+	r = si_shader_binary_upload(sscreen, shader);
+	if (r)
+		return r;
 
 	if (dump) {
 		if (!(sscreen->b.debug_flags & DBG_NO_ASM)) {