OSDN Git Service

radeonsi: report alloc failure from si_shader_binary_read
authorMarek Olšák <marek.olsak@amd.com>
Thu, 10 Sep 2015 16:15:40 +0000 (18:15 +0200)
committerEmil Velikov <emil.l.velikov@gmail.com>
Wed, 7 Oct 2015 13:10:03 +0000 (14:10 +0100)
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>
(cherry picked from commit 394d67a58f949245e8b3fad400e9efaa5829ec84)

src/gallium/drivers/radeonsi/si_shader.c

index d493329..1010b6e 100644 (file)
@@ -3829,11 +3829,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)) {