fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

si_compute: check NULL return from u_upload_alloc

Browse source 
Signed-off-by: Julien Isorce <jisorce@oblong.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Julien Isorce 2017-03-23 13:43:49 +00:00
parent c5fe99eec2
commit 4a5e779b5f
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gallium/drivers/radeonsi/si_compute.c
View file

@ -579,7 +579,7 @@ static void si_setup_user_sgprs_co_v2(struct si_context *sctx,
}
}
static void si_upload_compute_input(struct si_context *sctx,
static bool si_upload_compute_input(struct si_context *sctx,
const amd_kernel_code_t *code_object,
const struct pipe_grid_info *info)
{
@ -602,6 +602,9 @@ static void si_upload_compute_input(struct si_context *sctx,
&kernel_args_offset,
(struct pipe_resource**)&input_buffer, &kernel_args_ptr);
if (unlikely(!kernel_args_ptr))
return false;
kernel_args = (uint32_t*)kernel_args_ptr;
kernel_args_va = input_buffer->gpu_address + kernel_args_offset;
@ -636,6 +639,8 @@ static void si_upload_compute_input(struct si_context *sctx,
}
r600_resource_reference(&input_buffer, NULL);
return true;
}
static void si_setup_tgsi_grid(struct si_context *sctx,
@ -790,8 +795,11 @@ static void si_launch_grid(
si_set_atom_dirty(sctx, sctx->atoms.s.render_cond, false);
}
if (program->input_size || program->ir_type == PIPE_SHADER_IR_NATIVE)
si_upload_compute_input(sctx, code_object, info);
if ((program->input_size ||
program->ir_type == PIPE_SHADER_IR_NATIVE) &&
unlikely(!si_upload_compute_input(sctx, code_object, info))) {
return;
}
/* Global buffers */
for (i = 0; i < MAX_GLOBAL_BUFFERS; i++) {