Re: [Mesa-dev] [PATCH 2/4] si_compute: check NULL return from u_upload_alloc

2017-03-24 Thread Marek Olšák
I think we should also return from si_launch_grid if this fails.

Marek

On Fri, Mar 24, 2017 at 12:08 PM, Julien Isorce  wrote:
> Signed-off-by: Julien Isorce 
> ---
>  src/gallium/drivers/radeonsi/si_compute.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/src/gallium/drivers/radeonsi/si_compute.c 
> b/src/gallium/drivers/radeonsi/si_compute.c
> index 19a9189..e3ccc55 100644
> --- a/src/gallium/drivers/radeonsi/si_compute.c
> +++ b/src/gallium/drivers/radeonsi/si_compute.c
> @@ -602,6 +602,9 @@ static void si_upload_compute_input(struct si_context 
> *sctx,
>_args_offset,
>(struct pipe_resource**)_buffer, 
> _args_ptr);
>
> +   if (unlikely(!kernel_args_ptr))
> +   return;
> +
> kernel_args = (uint32_t*)kernel_args_ptr;
> kernel_args_va = input_buffer->gpu_address + kernel_args_offset;
>
> --
> 2.7.4
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH 2/4] si_compute: check NULL return from u_upload_alloc

2017-03-24 Thread Julien Isorce
Signed-off-by: Julien Isorce 
---
 src/gallium/drivers/radeonsi/si_compute.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gallium/drivers/radeonsi/si_compute.c 
b/src/gallium/drivers/radeonsi/si_compute.c
index 19a9189..e3ccc55 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -602,6 +602,9 @@ static void si_upload_compute_input(struct si_context *sctx,
   _args_offset,
   (struct pipe_resource**)_buffer, _args_ptr);
 
+   if (unlikely(!kernel_args_ptr))
+   return;
+
kernel_args = (uint32_t*)kernel_args_ptr;
kernel_args_va = input_buffer->gpu_address + kernel_args_offset;
 
-- 
2.7.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev