Reviewed-by: Marek Olšák <[email protected]> Marek
On Mon, Mar 27, 2017 at 3:46 PM, Julien Isorce <[email protected]> wrote: > Like done in si_state_draw.c::si_draw_vbo > > u_upload_alloc can fail, i.e. set output param *ptr to NULL, for 2 reasons: > alloc fails or map fails. For both there is already a fprintf/stderr in > radeon_create_bo and radeon_bo_do_map. > > In src/gallium/drivers/ it is a common usage to just avoid to crash by doing > a silent check. But defer fprintf where the error comes from, libdrm calls. > > Signed-off-by: Julien Isorce <[email protected]> > --- > src/gallium/drivers/r600/r600_state_common.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/src/gallium/drivers/r600/r600_state_common.c > b/src/gallium/drivers/r600/r600_state_common.c > index 6f8279f..cedeb74 100644 > --- a/src/gallium/drivers/r600/r600_state_common.c > +++ b/src/gallium/drivers/r600/r600_state_common.c > @@ -1746,6 +1746,10 @@ static void r600_draw_vbo(struct pipe_context *ctx, > const struct pipe_draw_info > > u_upload_alloc(ctx->stream_uploader, start, count * 2, > 256, &out_offset, &out_buffer, &ptr); > + if (unlikely(!ptr)) { > + pipe_resource_reference(&ib.buffer, NULL); > + return; > + } > > util_shorten_ubyte_elts_to_userptr( > &rctx->b.b, &ib, 0, 0, > ib.offset + start, count, ptr); > -- > 2.7.4 > > _______________________________________________ > mesa-dev mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
