[Mesa-dev] [PATCH] winsys/radeon: Do not deinit the pb cache if it was not initialized

[Marek Olšák]

Pushed, thanks.

Marek

On Fri, Jan 29, 2016 at 10:48 PM, Niels Ole Salscheider
<niels_ole at salscheider-online.de> wrote:
> This fixes a crash in pb_cache_release_all_buffers.
>
> Signed-off-by: Niels Ole Salscheider <niels_ole at salscheider-online.de>
> ---
>  src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
> index 8a1ed3a..4823bf3 100644
> --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
> +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
> @@ -742,7 +742,7 @@ radeon_drm_winsys_create(int fd, radeon_screen_create_t screen_create)
>      ws->fd = dup(fd);
>
>      if (!do_winsys_init(ws))
> -        goto fail;
> +        goto fail1;
>
>      pb_cache_init(&ws->bo_cache, 500000, 2.0f, 0,
>                    MIN2(ws->info.vram_size, ws->info.gart_size),
> @@ -812,8 +812,9 @@ radeon_drm_winsys_create(int fd, radeon_screen_create_t screen_create)
>      return &ws->base;
>
>  fail:
> -    pipe_mutex_unlock(fd_tab_mutex);
>      pb_cache_deinit(&ws->bo_cache);
> +fail1:
> +    pipe_mutex_unlock(fd_tab_mutex);
>      if (ws->surf_man)
>          radeon_surface_manager_free(ws->surf_man);
>      if (ws->fd >= 0)
> --
> 2.7.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev