From 62732ce263d2932025676d1a9d60e632f0af6586 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Thu, 26 Jan 2017 02:40:34 +0100 Subject: gallium/radeon: remove r600_common_context::max_db MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this cleanup is based on the vulkan driver, which seems to do the same thing Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeon/r600_pipe_common.c | 7 ------- src/gallium/drivers/radeon/r600_pipe_common.h | 2 -- src/gallium/drivers/radeon/r600_query.c | 28 ++++++++++++++++----------- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index 9adb8ec53da..95a6a486a3d 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -561,13 +561,6 @@ bool r600_common_context_init(struct r600_common_context *rctx, rctx->family = rscreen->family; rctx->chip_class = rscreen->chip_class; - if (rscreen->chip_class >= CIK) - rctx->max_db = MAX2(8, rscreen->info.num_render_backends); - else if (rscreen->chip_class >= EVERGREEN) - rctx->max_db = 8; - else - rctx->max_db = 4; - rctx->b.invalidate_resource = r600_invalidate_resource; rctx->b.transfer_map = u_transfer_map_vtbl; rctx->b.transfer_flush_region = u_transfer_flush_region_vtbl; diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index e72f4a2a649..2c11551e03a 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -585,8 +585,6 @@ struct r600_common_context { int num_perfect_occlusion_queries; struct list_head active_queries; unsigned num_cs_dw_queries_suspend; - /* Additional hardware info. */ - unsigned max_db; /* for OQ */ /* Misc stats. */ unsigned num_draw_calls; unsigned num_spill_draw_calls; diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c index cf5e62115b6..4b9a155dad2 100644 --- a/src/gallium/drivers/radeon/r600_query.c +++ b/src/gallium/drivers/radeon/r600_query.c @@ -435,6 +435,7 @@ static bool r600_query_hw_prepare_buffer(struct r600_common_context *ctx, if (query->b.type == PIPE_QUERY_OCCLUSION_COUNTER || query->b.type == PIPE_QUERY_OCCLUSION_PREDICATE) { + unsigned max_rbs = ctx->screen->info.num_render_backends; unsigned enabled_rb_mask = ctx->screen->info.enabled_rb_mask; unsigned num_results; unsigned i, j; @@ -442,13 +443,13 @@ static bool r600_query_hw_prepare_buffer(struct r600_common_context *ctx, /* Set top bits for unused backends. */ num_results = buffer->b.b.width0 / query->result_size; for (j = 0; j < num_results; j++) { - for (i = 0; i < ctx->max_db; i++) { + for (i = 0; i < max_rbs; i++) { if (!(enabled_rb_mask & (1<max_db; + results += 4 * max_rbs; } } @@ -518,7 +519,7 @@ static struct pipe_query *r600_query_hw_create(struct r600_common_context *rctx, switch (query_type) { case PIPE_QUERY_OCCLUSION_COUNTER: case PIPE_QUERY_OCCLUSION_PREDICATE: - query->result_size = 16 * rctx->max_db; + query->result_size = 16 * rctx->screen->info.num_render_backends; query->result_size += 16; /* for the fence + alignment */ query->num_cs_dw_begin = 6; query->num_cs_dw_end = 6 + r600_gfx_write_fence_dwords(rctx->screen); @@ -693,7 +694,7 @@ static void r600_query_hw_do_emit_stop(struct r600_common_context *ctx, radeon_emit(cs, va); radeon_emit(cs, (va >> 32) & 0xFFFF); - fence_va = va + ctx->max_db * 16 - 8; + fence_va = va + ctx->screen->info.num_render_backends * 16 - 8; break; case PIPE_QUERY_PRIMITIVES_EMITTED: case PIPE_QUERY_PRIMITIVES_GENERATED: @@ -929,6 +930,8 @@ static void r600_get_hw_query_params(struct r600_common_context *rctx, struct r600_query_hw *rquery, int index, struct r600_hw_query_params *params) { + unsigned max_rbs = rctx->screen->info.num_render_backends; + params->pair_stride = 0; params->pair_count = 1; @@ -937,9 +940,9 @@ static void r600_get_hw_query_params(struct r600_common_context *rctx, case PIPE_QUERY_OCCLUSION_PREDICATE: params->start_offset = 0; params->end_offset = 8; - params->fence_offset = rctx->max_db * 16; + params->fence_offset = max_rbs * 16; params->pair_stride = 16; - params->pair_count = rctx->max_db; + params->pair_count = max_rbs; break; case PIPE_QUERY_TIME_ELAPSED: params->start_offset = 0; @@ -1003,9 +1006,11 @@ static void r600_query_hw_add_result(struct r600_common_context *ctx, void *buffer, union pipe_query_result *result) { + unsigned max_rbs = ctx->screen->info.num_render_backends; + switch (query->b.type) { case PIPE_QUERY_OCCLUSION_COUNTER: { - for (unsigned i = 0; i < ctx->max_db; ++i) { + for (unsigned i = 0; i < max_rbs; ++i) { unsigned results_base = i * 16; result->u64 += r600_query_read_result(buffer + results_base, 0, 2, true); @@ -1013,7 +1018,7 @@ static void r600_query_hw_add_result(struct r600_common_context *ctx, break; } case PIPE_QUERY_OCCLUSION_PREDICATE: { - for (unsigned i = 0; i < ctx->max_db; ++i) { + for (unsigned i = 0; i < max_rbs; ++i) { unsigned results_base = i * 16; result->b = result->b || r600_query_read_result(buffer + results_base, 0, 2, true) != 0; @@ -1621,6 +1626,7 @@ void r600_query_fix_enabled_rb_mask(struct r600_common_screen *rscreen) struct r600_resource *buffer; uint32_t *results; unsigned i, mask = 0; + unsigned max_rbs = ctx->screen->info.num_render_backends; assert(rscreen->chip_class <= CAYMAN); @@ -1654,14 +1660,14 @@ void r600_query_fix_enabled_rb_mask(struct r600_common_screen *rscreen) /* create buffer for event data */ buffer = (struct r600_resource*) pipe_buffer_create(ctx->b.screen, 0, - PIPE_USAGE_STAGING, ctx->max_db*16); + PIPE_USAGE_STAGING, max_rbs * 16); if (!buffer) return; /* initialize buffer with zeroes */ results = r600_buffer_map_sync_with_rings(ctx, buffer, PIPE_TRANSFER_WRITE); if (results) { - memset(results, 0, ctx->max_db * 4 * 4); + memset(results, 0, max_rbs * 4 * 4); /* emit EVENT_WRITE for ZPASS_DONE */ radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 2, 0)); @@ -1675,7 +1681,7 @@ void r600_query_fix_enabled_rb_mask(struct r600_common_screen *rscreen) /* analyze results */ results = r600_buffer_map_sync_with_rings(ctx, buffer, PIPE_TRANSFER_READ); if (results) { - for(i = 0; i < ctx->max_db; i++) { + for(i = 0; i < max_rbs; i++) { /* at least highest bit will be set if backend is used */ if (results[i*4 + 1]) mask |= (1<