Mesa (master): radeonsi: report alloc failure from si_shader_binary_read

[Marek Olšák]

Module: Mesa
Branch: master
Commit: d00b3b8b0f74e7575966aee29919c5a2ba6eb4df
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d00b3b8b0f74e7575966aee29919c5a2ba6eb4df

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Sep 10 18:15:40 2015 +0200

radeonsi: report alloc failure from si_shader_binary_read

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

---

 src/gallium/drivers/radeonsi/si_shader.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 2e49a21..a3df648 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)) {