From 255de06c5990797832678d7af01876a1afca5b50 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 28 Oct 2019 09:58:31 +1100 Subject: util: remove LIST_ADDTAIL macro Just use the inlined function directly. The macro was replaced with the function in ebe304fa540f. Reviewed-by: Eric Engestrom --- src/gallium/drivers/nouveau/nouveau_mm.c | 4 ++-- src/gallium/drivers/nouveau/nv30/nv30_query.c | 2 +- src/gallium/drivers/r600/evergreen_state.c | 2 +- src/gallium/drivers/r600/r600_asm.c | 12 ++++++------ src/gallium/drivers/r600/r600_query.c | 2 +- src/gallium/drivers/r600/radeon_vce.c | 2 +- src/gallium/drivers/radeon/radeon_vce.c | 2 +- src/gallium/drivers/radeonsi/gfx10_query.c | 2 +- src/gallium/drivers/radeonsi/si_perfcounter.c | 2 +- src/gallium/drivers/radeonsi/si_query.c | 2 +- src/gallium/drivers/svga/svga_resource_buffer_upload.c | 2 +- src/gallium/drivers/svga/svga_screen_cache.c | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/gallium/drivers') diff --git a/src/gallium/drivers/nouveau/nouveau_mm.c b/src/gallium/drivers/nouveau/nouveau_mm.c index 9e5f908a10d..90a9ea2d92d 100644 --- a/src/gallium/drivers/nouveau/nouveau_mm.c +++ b/src/gallium/drivers/nouveau/nouveau_mm.c @@ -223,11 +223,11 @@ nouveau_mm_free(struct nouveau_mm_allocation *alloc) if (slab->free == slab->count) { LIST_DEL(&slab->head); - LIST_ADDTAIL(&slab->head, &bucket->free); + list_addtail(&slab->head, &bucket->free); } else if (slab->free == 1) { LIST_DEL(&slab->head); - LIST_ADDTAIL(&slab->head, &bucket->used); + list_addtail(&slab->head, &bucket->used); } FREE(alloc); diff --git a/src/gallium/drivers/nouveau/nv30/nv30_query.c b/src/gallium/drivers/nouveau/nv30/nv30_query.c index 5a0c49e2ce3..bb56c26af6a 100644 --- a/src/gallium/drivers/nouveau/nv30/nv30_query.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_query.c @@ -80,7 +80,7 @@ nv30_query_object_new(struct nv30_screen *screen) nv30_query_object_del(screen, &oq); } - LIST_ADDTAIL(&qo->list, &screen->queries); + list_addtail(&qo->list, &screen->queries); ntfy = nv30_ntfy(screen, qo); ntfy[0] = 0x00000000; diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index ca2ad5e6fbb..9c103c59062 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -698,7 +698,7 @@ texture_buffer_sampler_view(struct r600_context *rctx, view->tex_resource = &tmp->resource; if (tmp->resource.gpu_address) - LIST_ADDTAIL(&view->list, &rctx->texture_buffers); + list_addtail(&view->list, &rctx->texture_buffers); return &view->base; } diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c index 2fc9b1579b7..4856abe75c1 100644 --- a/src/gallium/drivers/r600/r600_asm.c +++ b/src/gallium/drivers/r600/r600_asm.c @@ -167,7 +167,7 @@ int r600_bytecode_add_cf(struct r600_bytecode *bc) if (!cf) return -ENOMEM; - LIST_ADDTAIL(&cf->list, &bc->cf); + list_addtail(&cf->list, &bc->cf); if (bc->cf_last) { cf->id = bc->cf_last->id + 2; if (bc->cf_last->eg_alu_extended) { @@ -930,7 +930,7 @@ static int merge_inst_groups(struct r600_bytecode *bc, struct r600_bytecode_alu if (result[i]) { LIST_DEL(&result[i]->list); result[i]->last = 0; - LIST_ADDTAIL(&result[i]->list, &bc->cf_last->alu); + list_addtail(&result[i]->list, &bc->cf_last->alu); } } @@ -1266,7 +1266,7 @@ int r600_bytecode_add_alu_type(struct r600_bytecode *bc, if (nalu->dst.sel >= bc->ngpr) { bc->ngpr = nalu->dst.sel + 1; } - LIST_ADDTAIL(&nalu->list, &bc->cf_last->alu); + list_addtail(&nalu->list, &bc->cf_last->alu); /* each alu use 2 dwords */ bc->cf_last->ndw += 2; bc->ndw += 2; @@ -1407,7 +1407,7 @@ static int r600_bytecode_add_vtx_internal(struct r600_bytecode *bc, const struct return -EINVAL; } } - LIST_ADDTAIL(&nvtx->list, &bc->cf_last->vtx); + list_addtail(&nvtx->list, &bc->cf_last->vtx); /* each fetch use 4 dwords */ bc->cf_last->ndw += 4; bc->ndw += 4; @@ -1477,7 +1477,7 @@ int r600_bytecode_add_tex(struct r600_bytecode *bc, const struct r600_bytecode_t if (ntex->dst_gpr >= bc->ngpr) { bc->ngpr = ntex->dst_gpr + 1; } - LIST_ADDTAIL(&ntex->list, &bc->cf_last->tex); + list_addtail(&ntex->list, &bc->cf_last->tex); /* each texture fetch use 4 dwords */ bc->cf_last->ndw += 4; bc->ndw += 4; @@ -1511,7 +1511,7 @@ int r600_bytecode_add_gds(struct r600_bytecode *bc, const struct r600_bytecode_g bc->cf_last->op = CF_OP_GDS; } - LIST_ADDTAIL(&ngds->list, &bc->cf_last->gds); + list_addtail(&ngds->list, &bc->cf_last->gds); bc->cf_last->ndw += 4; /* each GDS uses 4 dwords */ if ((bc->cf_last->ndw / 4) >= r600_bytecode_num_tex_and_vtx_instructions(bc)) bc->force_add_cf = 1; diff --git a/src/gallium/drivers/r600/r600_query.c b/src/gallium/drivers/r600/r600_query.c index 5bd059fd0e3..7282ca4b583 100644 --- a/src/gallium/drivers/r600/r600_query.c +++ b/src/gallium/drivers/r600/r600_query.c @@ -1047,7 +1047,7 @@ bool r600_query_hw_begin(struct r600_common_context *rctx, if (!query->buffer.buf) return false; - LIST_ADDTAIL(&query->list, &rctx->active_queries); + list_addtail(&query->list, &rctx->active_queries); return true; } diff --git a/src/gallium/drivers/r600/radeon_vce.c b/src/gallium/drivers/r600/radeon_vce.c index fc908d07bca..b4e048d0dff 100644 --- a/src/gallium/drivers/r600/radeon_vce.c +++ b/src/gallium/drivers/r600/radeon_vce.c @@ -104,7 +104,7 @@ static void reset_cpb(struct rvce_encoder *enc) slot->picture_type = PIPE_H264_ENC_PICTURE_TYPE_SKIP; slot->frame_num = 0; slot->pic_order_cnt = 0; - LIST_ADDTAIL(&slot->list, &enc->cpb_slots); + list_addtail(&slot->list, &enc->cpb_slots); } } diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c index ff2852f3ec0..af46fa776a6 100644 --- a/src/gallium/drivers/radeon/radeon_vce.c +++ b/src/gallium/drivers/radeon/radeon_vce.c @@ -98,7 +98,7 @@ static void reset_cpb(struct rvce_encoder *enc) slot->picture_type = PIPE_H264_ENC_PICTURE_TYPE_SKIP; slot->frame_num = 0; slot->pic_order_cnt = 0; - LIST_ADDTAIL(&slot->list, &enc->cpb_slots); + list_addtail(&slot->list, &enc->cpb_slots); } } diff --git a/src/gallium/drivers/radeonsi/gfx10_query.c b/src/gallium/drivers/radeonsi/gfx10_query.c index f87420e36bf..0b76da8d95b 100644 --- a/src/gallium/drivers/radeonsi/gfx10_query.c +++ b/src/gallium/drivers/radeonsi/gfx10_query.c @@ -170,7 +170,7 @@ static bool gfx10_alloc_query_buffer(struct si_context *sctx) results[32 * i + 16] = 0; } - LIST_ADDTAIL(&qbuf->list, &sctx->shader_query_buffers); + list_addtail(&qbuf->list, &sctx->shader_query_buffers); qbuf->head = 0; qbuf->refcount = sctx->num_active_shader_queries; diff --git a/src/gallium/drivers/radeonsi/si_perfcounter.c b/src/gallium/drivers/radeonsi/si_perfcounter.c index d073b5821fb..9d90ca6e53b 100644 --- a/src/gallium/drivers/radeonsi/si_perfcounter.c +++ b/src/gallium/drivers/radeonsi/si_perfcounter.c @@ -841,7 +841,7 @@ static bool si_pc_query_begin(struct si_context *ctx, struct si_query *squery) si_query_buffer_reset(ctx, &query->buffer); - LIST_ADDTAIL(&query->b.active_list, &ctx->active_queries); + list_addtail(&query->b.active_list, &ctx->active_queries); ctx->num_cs_dw_queries_suspend += query->b.num_cs_dw_suspend; si_pc_query_resume(ctx, squery); diff --git a/src/gallium/drivers/radeonsi/si_query.c b/src/gallium/drivers/radeonsi/si_query.c index 8871b46d405..c4a2ee6f130 100644 --- a/src/gallium/drivers/radeonsi/si_query.c +++ b/src/gallium/drivers/radeonsi/si_query.c @@ -1147,7 +1147,7 @@ bool si_query_hw_begin(struct si_context *sctx, if (!query->buffer.buf) return false; - LIST_ADDTAIL(&query->b.active_list, &sctx->active_queries); + list_addtail(&query->b.active_list, &sctx->active_queries); sctx->num_cs_dw_queries_suspend += query->b.num_cs_dw_suspend; return true; } diff --git a/src/gallium/drivers/svga/svga_resource_buffer_upload.c b/src/gallium/drivers/svga/svga_resource_buffer_upload.c index 1bb7431abf4..58d841d34bd 100644 --- a/src/gallium/drivers/svga/svga_resource_buffer_upload.c +++ b/src/gallium/drivers/svga/svga_resource_buffer_upload.c @@ -1065,7 +1065,7 @@ svga_buffer_handle(struct svga_context *svga, struct pipe_resource *buf, if (ret == PIPE_OK) { sbuf->dma.pending = TRUE; assert(!sbuf->head.prev && !sbuf->head.next); - LIST_ADDTAIL(&sbuf->head, &svga->dirty_buffers); + list_addtail(&sbuf->head, &svga->dirty_buffers); } } else if (ret == PIPE_ERROR_OUT_OF_MEMORY) { diff --git a/src/gallium/drivers/svga/svga_screen_cache.c b/src/gallium/drivers/svga/svga_screen_cache.c index 2f8ff91fbee..195a1158558 100644 --- a/src/gallium/drivers/svga/svga_screen_cache.c +++ b/src/gallium/drivers/svga/svga_screen_cache.c @@ -446,7 +446,7 @@ svga_screen_cache_init(struct svga_screen *svgascreen) list_inithead(&cache->empty); for (i = 0; i < SVGA_HOST_SURFACE_CACHE_SIZE; ++i) - LIST_ADDTAIL(&cache->entries[i].head, &cache->empty); + list_addtail(&cache->entries[i].head, &cache->empty); return PIPE_OK; } -- cgit v1.2.3