Module: Mesa Branch: master Commit: caf41fb96d7e376a25499cf5e8f8c2ec89848439 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=caf41fb96d7e376a25499cf5e8f8c2ec89848439
Author: Marek Olšák <[email protected]> Date: Wed Jul 11 23:19:15 2018 -0400 winsys/amdgpu: make amdgpu_cs_context::flags & handles local Reviewed-by: Samuel Pitoiset <[email protected]> --- src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 23 +++++------------------ src/gallium/winsys/amdgpu/drm/amdgpu_cs.h | 4 ---- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c index 6628ff9f17..9aa489adaa 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c @@ -902,9 +902,7 @@ static void amdgpu_cs_context_cleanup(struct amdgpu_cs_context *cs) static void amdgpu_destroy_cs_context(struct amdgpu_cs_context *cs) { amdgpu_cs_context_cleanup(cs); - FREE(cs->flags); FREE(cs->real_buffers); - FREE(cs->handles); FREE(cs->slab_buffers); FREE(cs->sparse_buffers); FREE(cs->fence_dependencies); @@ -1328,19 +1326,8 @@ void amdgpu_cs_submit_ib(void *job, int thread_index) goto bo_list_error; } - if (cs->max_real_submit < cs->num_real_buffers) { - FREE(cs->handles); - FREE(cs->flags); - - cs->handles = MALLOC(sizeof(*cs->handles) * cs->num_real_buffers); - cs->flags = MALLOC(sizeof(*cs->flags) * cs->num_real_buffers); - - if (!cs->handles || !cs->flags) { - cs->max_real_submit = 0; - r = -ENOMEM; - goto bo_list_error; - } - } + amdgpu_bo_handle *handles = alloca(sizeof(*handles) * cs->num_real_buffers); + uint8_t *flags = alloca(sizeof(*flags) * cs->num_real_buffers); num_handles = 0; for (i = 0; i < cs->num_real_buffers; ++i) { @@ -1351,8 +1338,8 @@ void amdgpu_cs_submit_ib(void *job, int thread_index) assert(buffer->u.real.priority_usage != 0); - cs->handles[num_handles] = buffer->bo->bo; - cs->flags[num_handles] = (util_last_bit64(buffer->u.real.priority_usage) - 1) / 4; + handles[num_handles] = buffer->bo->bo; + flags[num_handles] = (util_last_bit64(buffer->u.real.priority_usage) - 1) / 4; ++num_handles; } @@ -1361,7 +1348,7 @@ void amdgpu_cs_submit_ib(void *job, int thread_index) if (num_handles) { r = amdgpu_bo_list_create(ws->dev, num_handles, - cs->handles, cs->flags, &bo_list); + handles, flags, &bo_list); } else { r = 0; } diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h index 5f96193750..3b10cc66c2 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h @@ -81,10 +81,6 @@ struct amdgpu_cs_context { unsigned num_real_buffers; struct amdgpu_cs_buffer *real_buffers; - unsigned max_real_submit; - amdgpu_bo_handle *handles; - uint8_t *flags; - unsigned num_slab_buffers; unsigned max_slab_buffers; struct amdgpu_cs_buffer *slab_buffers; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
